From nobody Tue May 6 22:02:19 2025 X-Original-To: dev-commits-src-main@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 4ZsXSF0ymZz5vWQn; Tue, 06 May 2025 22:02:21 +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 4ZsXSD2qZYz3NLm; Tue, 06 May 2025 22:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568940; 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=GzOutXgHOAlIATQiLr0Nq0NcHGI08G58f9vUikX19tw=; b=EfEBKp4EHRkssVlqnrxzqGQ/MRSpr8hKDb2ZphVm/AZTEvcWZU3ijwzuFI2ctoPZyIZMwg qrnVpbKWoam4G3FGVrx8YgcAsQq57NsEieby8lDd4ykUOMtLg9gnZqz8LtLPXnlDjJ1X74 IXPqoQpr6SCxw9qB3aoPQO6nc9uuQfVtOTqsFvu/Qg8yKJLav8ik2ZCBfuDR9dCwNs6om7 nfnonRiBerJfvSg5OmB2Q3vWXf1o8bs6iJHjnVIc4SZPVtPvwKOwdcs5kYKzduFeVHqBKp uoZL+4cp7rjj/dy7//ZFjD79HYnRS8VVOZWS0+AWLHva6KouvErk4pc2gsf95w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568940; 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=GzOutXgHOAlIATQiLr0Nq0NcHGI08G58f9vUikX19tw=; b=FSM3nS9fBdWEkP+spAUFe76awR2NyRH+n/cc40Kh1RPQ4RxxN+ASM8uSHE9ux2zttqu55A nBQYc7dVkq/wEQYPrCWc5p/oAIlEd0N9uYnSgIBQWQlFdRnwuSng1SGBK2mdhakE8kBXbX X6Tfrm0CBRCx4xYOMiOGZLFBrKVF3/GoQBMSaC1ue8AMJ8cgehev/nWrw4rFFmqfAzhkM4 2i+oQHqw35FwMSM4jKDV6N/WUAd0+e5bHov+KyMJtahguWVrgeCpK4L0anhUj+vfUhGPng Nt+jog1HXjuZ6J7dERXmOZWSYDKn5eVIv3O5i6f+ngQVrdDNW/Tshx7QMZTq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568940; a=rsa-sha256; cv=none; b=fViu+i3cIB22uH+hLkL49CqHY9YrLugXT3mvNLUiqqELP+btGRSaIRAQ26SmdWADGfsp3T 9mP9xDGfvEfIPcJJO4oyvn5lMNFDvxRjvhrORCZK2CmAVIIOCBvt1+jxUC+k4PDYj2Twgk 3iGDBMxdtvbIW8LAGghe9gh6T3511z99qrHe2dnUc/Z/Z20cvTn3cOXZQyjIA4L76xYYIe yGLlz9o6hFjFTYXNRFhEWS5Onq0rbzhHr1fPaK0Ha+AbIoLsZO306iUB3Cf8PYVA13jqkx kwZIdF8H+GoPs9pDVHZmjW9x6CVLv7AoPfMJuAjzXifryTI8TDXWrHcIBXWQZA== 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 4ZsXSC69n6z1H6B; Tue, 06 May 2025 22:02:19 +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 546M2JE8042410; Tue, 6 May 2025 22:02:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Jjo042407; Tue, 6 May 2025 22:02:19 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:19 GMT Message-Id: <202505062202.546M2Jjo042407@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: c73b33f85a4d - main - devinfo: Add helper function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c73b33f85a4d34d221c125780a059d86a8351f0b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c73b33f85a4d34d221c125780a059d86a8351f0b commit c73b33f85a4d34d221c125780a059d86a8351f0b Author: ktullavik AuthorDate: 2024-10-17 19:01:51 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Add helper function 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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index d12f9d4ec331..04809323ec70 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -52,6 +52,7 @@ 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 *); +static void print_path(struct devinfo_dev *, char *); struct indent_arg { @@ -286,6 +287,15 @@ print_device_path(struct devinfo_dev *dev, void *xname) return (rv); } +static void +print_path(struct devinfo_dev *root, char *path) +{ + if (devinfo_foreach_device_child(root, print_device_path, (void *)path) == 0) + errx(1, "%s: Not found", path); + if (!vflag) + printf("\n"); +} + static void __dead2 usage(void) { @@ -336,10 +346,7 @@ main(int argc, char *argv[]) errx(1, "can't find root device"); if (path) { - if (devinfo_foreach_device_child(root, print_device_path, (void *)path) == 0) - errx(1, "%s: Not found", path); - if (!vflag) - printf("\n"); + print_path(root, path); } else if (uflag) { /* print resource usage? */ devinfo_foreach_rman(print_rman, NULL);