From nobody Tue May 6 22:02:15 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 4ZsXS86G4Lz5vWNN; 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 4ZsXS74mvGz3NZF; Tue, 06 May 2025 22:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568935; 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=7cGpqH2WX1ZTpbrE1hapM0l73qBnlOZrH8bSsEMwbJo=; b=BkdlHeo2mJ6vIr/y0uwxgmm1SxsANnnZ+D8LodADjK1UcAE8RI7v9M0/kuoPbFnasIhZbC kgUASQXFhgWqNuPFzBIC8QLNDFsSwOD+vvPoX1yIG6nLDMBbFppDkvU5JWAUDPIwwUkhPf p6UKmC/HIyxHt3ek8g8QzK3AG1WuSGpjaZgSgEgG0zF7t2u60HRuDkl9OoCtacu38Dc9F8 9PnaeWManX/CWbto9ADgNlgDLnpVqI0w2b5Dl0oZcKwPqdNXguPJBi/lK+S8aMRUKjfdxD 8rIH3vryzVxbkSyFJ5d2LEGG80M3SVPDaCH5vsU0hN5QczicQlelwaNSIOHILw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568935; 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=7cGpqH2WX1ZTpbrE1hapM0l73qBnlOZrH8bSsEMwbJo=; b=LTVbtVajYdiRk+W9alu2AnCROntEI0tZ0MN3XNY0MBey1oFFIM+8MBWKpwlAyFtNyaZm8J fsWYN37EmybhWEbDPwGAWFf4Jx1Xh/RLfrTRC9NRPg+1hW1iPFIksnTV/3pQfJ49FvMAAd 2QGzlrOsgpjyu7x9YZX/X7IwlfiUiycrXbfhJuciTs0E+hhETstdSB76wVCWf9ynYXcvMa KP55/T7bYXghNNmpcpJ50igUJk3ZR5nIA5SAJfU1R3ueOXc5ZwWaSp9CHCqDs8HUWc3fEQ JhXCW1AzzpP/Ix/8vXkWO3IvKBdDm36FYLXRm8Fgd7n2GStkYpRFfdZYyYq6XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568935; a=rsa-sha256; cv=none; b=jA77XaPK5McBY0qECdELPg+GM/uKCEsiOXPWDn9b+CUF38u9+tKCA0X+1b1DZ/9GP9FlW/ BvDFwFl/nJWGBkvXyZjEMNx0o6ehfoN5lN/8RqMbHt4GlxOXADWtjewEA3o6UGhjrDO03T tbTVA6k3IcBknb/TwTI6lWltuQuMPNTKvAgLXtgcBNIhzb+y58LVUM1uotNToA2O83R39n ccwHMpBhhsKWmvGVCgS9X7Cw4oXOLsRBfBiJ0mpGW1DeCZFo/tD8MPzKXPYDSWtQzRqRuQ wqDF28c4UtcRJ6xRQk/GOMMOPAobFOJGuYKryg5PBximsUT7d6WMy9Gg+09qbQ== 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 4ZsXS736Zqz1GcM; Tue, 06 May 2025 22:02:15 +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 546M2FKR042271; Tue, 6 May 2025 22:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2F0r042268; Tue, 6 May 2025 22:02:15 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:15 GMT Message-Id: <202505062202.546M2F0r042268@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: 204a9e96741e - main - devinfo: Put expression into variable 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: 204a9e96741ef22061cc2c8b0192208b66ab3c80 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=204a9e96741ef22061cc2c8b0192208b66ab3c80 commit 204a9e96741ef22061cc2c8b0192208b66ab3c80 Author: ktullavik AuthorDate: 2024-10-17 17:55:49 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Put expression into variable in prep for libxo We'll need it twice when libxo is added. No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1480 --- usr.sbin/devinfo/devinfo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index b639dbf89a97..a4fa6892981f 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -183,8 +183,10 @@ print_device(struct devinfo_dev *dev, void *arg) { struct indent_arg ia; int indent; + bool printit = vflag || (dev->dd_name[0] != 0 && + dev->dd_state >= DS_ATTACHED); - if (vflag || (dev->dd_name[0] != 0 && dev->dd_state >= DS_ATTACHED)) { + if (printit) { indent = (int)(intptr_t)arg; print_indent(indent); print_dev(dev);