From nobody Tue May 6 22:02:22 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 4ZsXSH35Gcz5vWk3; 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 4ZsXSG2QJ2z3P13; Tue, 06 May 2025 22:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568942; 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=f4xG3tFNhjM0SokicPUyXFb6DokPS4oM7Jy6ZGVIwQM=; b=BhmRvAbE7T+4bhK0xoD4h726tbgUg5FfTD0UO8JpD2sMHzX+rMmmKTESfUy9m40KMb9Q/f pcPA5A0IbDHFVMB19PI49SbXhQLFndzohkfF2qvZDry3Oy7iwVVatkO/qFRmhrPAXb6mRq IuwiHBuZMpZCL/3xVV9KH0GInwYgDjnPuTJRLSKn9VSL2DPezv4AzBOLiV9uKdyR/Lc+EZ asC8bs0wjL11lymvvuIqTz1MQMPSnmttcAy83sXbQKRGtuDErdlYZqcTaS6exmlOtwtDQV 0Xmt0hkxdzEeZgFVde4gBLZraHHQX/Ws6QcOd3xXDLxlVuWyTMZ0PP6lfwZi7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568942; 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=f4xG3tFNhjM0SokicPUyXFb6DokPS4oM7Jy6ZGVIwQM=; b=ZZw3Z//b32DqsG5JHVP9yi5i/SbFVJsl82aYVhSfxtzWuUcVs8NnmSujun4bw8nWtkNubQ J9ammt2zCemElU2/Re7F5HhGSOoc1duSkarnFGATittJygXjcM6GNcpXaj8aCtNtx6o9IU D7kdDDbmGe0z6q8H9UqQ9qWe1HoiMqLTCNeRf91iKU8iX0pmN8BpiqtmZMWkjyyM22WKJo ZfipJ/9NBGUskwZ9RzLeqSY6oNqO6UHizJmJnTADmwG3ynI7OdpgDhtPW4pjhA9WiqgCKt UYrzfQP5rNtDchpEyPdK39FyowaObLViaLA1yld1f/Wv3BR32W7JN1ZeAEHiiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568942; a=rsa-sha256; cv=none; b=L4ywMmCseShVV/oKtIqnIkNrS0rLpZ6si1+EMPIibW5fpdPBWlaP+woqnvb9HF4j0Fc0EP KaDa/2fD7cgbkKx4UR12zTsbsjIcmKFNzp3dAHTBdKCJVaU3Mg5M8j+MiDYWK7/1K4gvNv S3GTF8oa2VLNr8OdB6CNJuQEicWmEJUFHDL3EZY96qPTqcZhH/2FF5Z3w4Jala9kISYmCh ZzmYqXs4m2HuCYXvejRaUcelhL8V/PDPJvm+W/gT5j/y/3mz5kUB0v8kqMXowKeuFh3pBk FAcIuHs8l23PTh3453BJsaslPcZalJHiLYfcFEElZlEcUGAbQPMGYxvgOTtX1g== 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 4ZsXSG0tC2z1GYK; Tue, 06 May 2025 22:02:22 +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 546M2MHV042482; Tue, 6 May 2025 22:02:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Mbe042479; Tue, 6 May 2025 22:02:22 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:22 GMT Message-Id: <202505062202.546M2Mbe042479@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: d43ba99dd067 - main - devinfo: Rename function and move out printf of device name 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: d43ba99dd0679b6d3efbffca6ad2437482095714 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d43ba99dd0679b6d3efbffca6ad2437482095714 commit d43ba99dd0679b6d3efbffca6ad2437482095714 Author: ktullavik AuthorDate: 2024-10-17 19:46:50 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Rename function and move out printf of device name 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 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index f7ddf44aba96..183b13b4201b 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -49,7 +49,7 @@ static void print_indent(int); static void print_resource(struct devinfo_res *); static int print_device_matching_resource(struct devinfo_res *, void *); static int print_device_rman_resources(struct devinfo_rman *, void *); -static void print_dev(struct devinfo_dev *); +static void print_device_props(struct devinfo_dev *); 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 *); @@ -156,11 +156,8 @@ print_device_rman_resources(struct devinfo_rman *rman, void *arg) } static void -print_dev(struct devinfo_dev *dev) +print_device_props(struct devinfo_dev *dev) { - - printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); - if (vflag) { if (*dev->dd_desc) { printf(" <%s>", dev->dd_desc); @@ -179,7 +176,6 @@ print_dev(struct devinfo_dev *dev) printf(" (suspended)"); } - /* * Print information about a device. */ @@ -194,7 +190,8 @@ print_device(struct devinfo_dev *dev, void *arg) if (printit) { indent = (int)(intptr_t)arg; print_indent(indent); - print_dev(dev); + printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); + print_device_props(dev); printf("\n"); if (rflag) { ia.indent = indent + 4; @@ -274,7 +271,8 @@ print_device_path(struct devinfo_dev *dev, void *xname) int rv; if (strcmp(dev->dd_name, name) == 0) { - print_dev(dev); + printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); + print_device_props(dev); if (vflag) printf("\n"); return (1); @@ -283,7 +281,8 @@ print_device_path(struct devinfo_dev *dev, void *xname) rv = devinfo_foreach_device_child(dev, print_device_path, xname); if (rv == 1) { printf(" "); - print_dev(dev); + printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); + print_device_props(dev); if (vflag) printf("\n"); }