Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 May 2025 22:02:18 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 471cff3eba53 - main - devinfo: Rename function and add declaration
Message-ID:  <202505062202.546M2IHI042371@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=471cff3eba5318ea5800a22ba0de547fa7da601a

commit 471cff3eba5318ea5800a22ba0de547fa7da601a
Author:     ktullavik <ktullavik@gmail.com>
AuthorDate: 2024-10-17 18:55:09 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505062202.546M2IHI042371>