From nobody Tue May 6 22:02:14 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 4ZsXS82dQBz5vWNM; Tue, 06 May 2025 22:02:16 +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 4ZsXS65cvVz3NYy; Tue, 06 May 2025 22:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568934; 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=EP/zXtVU9q75m3p59k1KLAMFwFKOFS3oLKD6U+TDzfQ=; b=A0rKemoEfkHaFKjTFodTkvSxtCZS+ReWWuZYG1YbMVSeeFucz8MoRNpvjNbTlYG3UYkMIe fkvpMvmcp+lm0iS6JFxBg6KfaN5QgbNMtNo5wt+4Qk3I93DqCWZJTYCRy937G7Nhp89llb VgrHaLGP2WltBmsiCmBNh+CThotLhKibfgu6z35QdHnl5LVqDzoovtIZMi5rcGgTTlGOTW zWwhSywqtsrRzrlzu6NV0s08TXO1HID9au6m7HuQWISJYPAvKk+j2z8ptMSbJNIclQ+von ljgnSt3jB6qxqKmJkjg48nZIqlRzr5a88SuEa/7+wsxqZTON3/F11/BDH2QLew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568934; 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=EP/zXtVU9q75m3p59k1KLAMFwFKOFS3oLKD6U+TDzfQ=; b=Z49kDsUQrfxKdRFsmsf2DFH+/cfUvwZ3TluiFwGJxygsXLy2zS/ji+/zIcw5TjY5g4yNhR JAm1x3PmwbMAsGwnHx2Azm9T7daiwAfVNH1T6AQXKeKG5NtBJhNmr0gMjnv5n3FWDX0e1z j6Nm7ivFq7fclPYu1cvBDcHqmnFa7nLI429Q5aKm8kiK2LNm5lp88JPxG/1T5Kjcq0r0CN t8MLwF3evJgfJrotemOsuE8Zpk695VLmzgmyHOPgU71c653qRKsNgT5ceoYoyyiFyWPOio Oph4eq5jHG9aB7MRBFsEi6oNd4d6ROnPhgS9GrzVBBsJm+7ppRqmx4dzEDPP5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568934; a=rsa-sha256; cv=none; b=CG6bMBLkEG3q2mRqNc6aN/+ykXK6SZtKjmbSN/51N5rOKgExxlgA5BR5JnQZDHPT3vcpQk eVW+fWmecUVWputWYmfGLvwPjKjdg+mwvt6zeY/aDP/ldYTAuXjYv1SzumBf6BeF0qBJUr HFKxRtS6TDe1AcHEuWEETQvGzbZHGPjSkVfWNy+VDLLqi42nn2cHOuAuWSwXxzC+tbqU6Y A3bp0vstKZapngFwP71XpF2JGX5bD/LViBuGR/Tvf2MdVdBTYN+V07XjejIU5ORnxRzsOJ pAuSSEjHLjN5ke6xsiVcNr2863lM7hOcSR7Z0wV/Z8fLzQj4grFmKcx6UtPoKQ== 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 4ZsXS61Z2Sz1H7g; Tue, 06 May 2025 22:02:14 +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 546M2EOd042236; Tue, 6 May 2025 22:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Evb042233; Tue, 6 May 2025 22:02:14 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:14 GMT Message-Id: <202505062202.546M2Evb042233@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: 763ac7a34336 - main - devinfo: Turn '&&' into nested condition in prep for libxo 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: 763ac7a343363a3edee5b3fc4012d159a4cd2baa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=763ac7a343363a3edee5b3fc4012d159a4cd2baa commit 763ac7a343363a3edee5b3fc4012d159a4cd2baa Author: ktullavik AuthorDate: 2024-10-17 17:42:20 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Turn '&&' into nested condition in 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 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 4343c7dd3457..b639dbf89a97 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -155,12 +155,19 @@ print_dev(struct devinfo_dev *dev) { printf("%s", dev->dd_name[0] ? dev->dd_name : "unknown"); - if (vflag && *dev->dd_desc) - printf(" <%s>", dev->dd_desc); - if (vflag && *dev->dd_pnpinfo) - printf(" pnpinfo %s", dev->dd_pnpinfo); - if (vflag && *dev->dd_location) - printf(" at %s", dev->dd_location); + + if (vflag) { + if (*dev->dd_desc) { + printf(" <%s>", dev->dd_desc); + } + if (*dev->dd_pnpinfo) { + printf(" pnpinfo %s", dev->dd_pnpinfo); + } + if (*dev->dd_location) { + printf(" at %s", dev->dd_location); + } + } + if (!(dev->dd_flags & DF_ENABLED)) printf(" (disabled)"); else if (dev->dd_flags & DF_SUSPENDED)