From nobody Tue May 6 22:02:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXSC4RcRz5vWNP; Tue, 06 May 2025 22:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXSB5ggbz3NmH; Tue, 06 May 2025 22:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czysMMD4zlbTtkED6tdHQqV0oRYFwZZEEO119/iafzY=; b=rwOc0XywuJssGi9ZOarqrrOM8hXaD92AUT5bFynFNOpUCTWUT+1DCv0BFIMHP4AAUsdVhe C7GaukamUA3OR8YZJmHShl5klWMWwwEAnQO48rUWbtyI9jDnR5/TFSUegcIeZ/HW1Rrmed p4d1/YsiQvSZpemRupiDp/mZ0mvL9cpZ3YwjHqyg+nig0NOVnPJnBdc5gzhDjMdP0/tZjc W5PMG2hYQIKatXu+ZIes/5toG09hsDAPw1ybuUW0v2fjhF0l/jVofX8Sb0fJEulLrgMQXf DJ5bOGPwtCGgZ4UEtk26va48E63Dr2r2UltA7hqr5icI8q2rbFtdUj0w+YMsKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czysMMD4zlbTtkED6tdHQqV0oRYFwZZEEO119/iafzY=; b=xRhbeAIjMJ2KktD3Q4OSVbnoUPQTVidfyItGGQf+YoFiT/PjZ4BYlu0METdFfHgXU+kJZ6 q6oEKfOtQAa95ClYsZlnMuaEkp7foUNFh1LbAGvQGeA6FPqeumSR7lRcJTYyu0opqZ7DPx v5Km9DegYjNo79kH5H3Tfrav1LNIXTkSY1v9+B42GKqrSlsVcVw9QuqTz6HjJlzdiTuPmH CWfsp7zDZ3w/Ka5g12OQuR/KER4dTcFaIicEMg2V0/JiX/HMOEqv/aSubmpiaRqYxmn3ht WK5Wqiv55ZKcAK2KwSE8LbRqvkLEC1vDREy1hjseBNI4nKT0+R+wap4EPBKa9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568938; a=rsa-sha256; cv=none; b=BlnnseITrHB2czi9GWkI8ujKEX+YXD/5mTeLHc0Qwm/CR39e0/jwpmb5vq68aTCZ0KaaHZ bq9QfYR+MJq/xe7398U2SaKGU9Htx85CyvCJWmbAVDKWUge8yryOiaOGfN1lA/r9vhnYI/ TyD99mBdPkbXx0lBSER36ey4VY987TlHkw08nZIWSVkt41yEiv4MyYxnPsZxTTicugkrtE DN77bgBZsm5s4ov89oT83pGZ6NCzTcsDKuPH1yXdVoEKaa7vIBjM2PbK/kcukHw++JW+mU SIcYW4O5oV+Bh340Y1yoNyi03WFQ99AcOKMOzLCcCuPC+XbLlXFiCe7qvJiNaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXSB5GYfz1H68; Tue, 06 May 2025 22:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546M2IIq042374; Tue, 6 May 2025 22:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2IHI042371; Tue, 6 May 2025 22:02:18 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:18 GMT Message-Id: <202505062202.546M2IHI042371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 471cff3eba53 - main - devinfo: Rename function and add declaration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 471cff3eba5318ea5800a22ba0de547fa7da601a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=471cff3eba5318ea5800a22ba0de547fa7da601a commit 471cff3eba5318ea5800a22ba0de547fa7da601a Author: ktullavik AuthorDate: 2024-10-17 18:55:09 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Rename function and add declaration This is prep for libxo. No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1480 --- usr.sbin/devinfo/devinfo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 686f4a09f73c..d12f9d4ec331 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -51,6 +51,7 @@ static int print_device_rman_resources(struct devinfo_rman *, void *); static int print_device(struct devinfo_dev *, void *); static int print_rman_resource(struct devinfo_res *, void *); static int print_rman(struct devinfo_rman *, void *); +static int print_device_path(struct devinfo_dev *, void *); struct indent_arg { @@ -263,7 +264,7 @@ print_rman(struct devinfo_rman *rman, void *arg __unused) } static int -print_path(struct devinfo_dev *dev, void *xname) +print_device_path(struct devinfo_dev *dev, void *xname) { const char *name = xname; int rv; @@ -275,7 +276,7 @@ print_path(struct devinfo_dev *dev, void *xname) return (1); } - rv = devinfo_foreach_device_child(dev, print_path, xname); + rv = devinfo_foreach_device_child(dev, print_device_path, xname); if (rv == 1) { printf(" "); print_dev(dev); @@ -335,7 +336,7 @@ main(int argc, char *argv[]) errx(1, "can't find root device"); if (path) { - if (devinfo_foreach_device_child(root, print_path, (void *)path) == 0) + if (devinfo_foreach_device_child(root, print_device_path, (void *)path) == 0) errx(1, "%s: Not found", path); if (!vflag) printf("\n");