From nobody Tue May 06 22:02:23 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 4ZsXSH4Txlz5vWk4; Tue, 06 May 2025 22:02:23 +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 4ZsXSH2V2kz3NvN; Tue, 06 May 2025 22:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568943; 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=8AYvjxm19kaU81V3eKRcBKUrAm6U2b4UQ3x7Bi0tDdo=; b=czCPdqpW/gha8bJDbsE18JmEeEFEpEYGTC1a3eu1Q4FhtXa4bDivZbQgtgOOXoeHQ9Cxhj PUnRTcJcfQFIMHxZCZ3OATyGlJ4m/1xDMtart9grV9028x7glir11XHN5sneXBw6jqTOZO EH5lDEi213vCLmc7V01H6AUAIlBPSCK8pIFEYe9wQ8mfZRaSACpKBrQknjcpfeKPZYpzCC i6TO28cA2TDBl+7Xdi/uiZCllgTxt0vUv1NS0RgFbnvwOlM9Oxy8HM4BkL5qZf5SvPqs89 2gCOOAp+vsfGlaV32+bDPFHuP+IstuM5udH4B0Odt4So854TM3dIBrN2pw3z2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568943; 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=8AYvjxm19kaU81V3eKRcBKUrAm6U2b4UQ3x7Bi0tDdo=; b=VvFSfSvfWVIcLM2R0aZcGirm22rfw81QPUVXrcRWxgLznvEFCykON7Z5t+WDRQuhFQiQpn SlM/21BoMN2UchjhHjc1/m/xqzz2hUKPeISgh+RoA1PzU5PuXEs1Nr7MlbzEVtLgEa4jDK 5ArV1XtxAp4o+Zh8LR6L/PUR8LT+1eHKXoAgFohsqiBpRHCdEWJnPOcl7eRte6xazTq1ZF B8Ob/VddudqhQT6Zm+MQDjx5cOVpmJ3MUV8UBr5AV4vruPXm3xIj6y0qXCapjCkeKS0Scg hnejctdcxzjDChU5wuacAEhw+J/9yKHcRecdI3DXu5o2AXO/3oQmXSGRuL8xeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568943; a=rsa-sha256; cv=none; b=tD6IqGDfMZFcj5C7b/fyy9s8cmi1nV2yEKa/CyIJhlknLCFn3V3+lcjLSW7fQLvxF7qJiD r5ej2UatOH573AXhOCCYZKEQncfbQkaYpHPDoVVeiaT/70kLYK1ILFny/MSllEy5wOgAr6 7pW+H/t8b0DQ70HtQD5WftL2EmlJt/nUefyt93gNZvG0+dvHVG6SjAwkn7LyokTq1tF2OW dwnIP/USBV1D/bRWqA2FDGNgivwsUlwii6d5zUNmhSPneosG9QXnyc/YqUgYqSmg5onGtj EVoTaNyZnvVw53UDQIuMgeV+yS9r0b4a7ST+Ul5AewOk+F2fRYfwZv9WTaVKCQ== 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 4ZsXSH1stVz1Gf5; Tue, 06 May 2025 22:02:23 +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 546M2NYq042515; Tue, 6 May 2025 22:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2NwR042512; Tue, 6 May 2025 22:02:23 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:23 GMT Message-Id: <202505062202.546M2NwR042512@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: e90dd5d67365 - main - devinfo: Factor out 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: e90dd5d67365c210881f665290b3b39317685c5a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e90dd5d67365c210881f665290b3b39317685c5a commit e90dd5d67365c210881f665290b3b39317685c5a Author: ktullavik AuthorDate: 2024-10-17 20:13:03 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:47 +0000 devinfo: Factor out 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 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 183b13b4201b..43d88481d903 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -264,6 +264,17 @@ print_rman(struct devinfo_rman *rman, void *arg __unused) return(0); } +static void +print_device_path_entry(struct devinfo_dev *dev) +{ + const char *devname = dev->dd_name[0] ? dev->dd_name : "unknown"; + + printf("%s", devname); + print_device_props(dev); + if (vflag) + printf("\n"); +} + static int print_device_path(struct devinfo_dev *dev, void *xname) { @@ -271,20 +282,14 @@ print_device_path(struct devinfo_dev *dev, void *xname) int rv; if (strcmp(dev->dd_name, name) == 0) { - printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); - print_device_props(dev); - if (vflag) - printf("\n"); + print_device_path_entry(dev); return (1); } rv = devinfo_foreach_device_child(dev, print_device_path, xname); if (rv == 1) { printf(" "); - printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); - print_device_props(dev); - if (vflag) - printf("\n"); + print_device_path_entry(dev); } return (rv); }