From nobody Tue May 06 22:02:13 2025 X-Original-To: dev-commits-src-all@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 4ZsXS53ktXz5vWg2; Tue, 06 May 2025 22:02:13 +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 4ZsXS51Lgxz3NQL; Tue, 06 May 2025 22:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568933; 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=MeoVz8VJ1L8lwd710tzRiq/1e0JRH/X3krBjVJJMcTI=; b=VS/0XEXSE/4NcuAYkFW4VLxV1fhZlS5InjUCKDy5Yw9J0IfbMYLdlzcJSpeBlN4QYEF1BF YyNGwNWFw7Z1ctvyVtZKQsE0qj+1jXgFxnc7BZaR9P9ixgzQyYmugAD+slmszO+BtkTWpI RGfY3FQKPQ8WakMJRI8JSlZay5WThkO1wYMQ6CGASH4O64jkn7o5YO5kBqDClfNCJIr69T 0L7HiIWw7+VemWt9BEAhupPwmy5YJaC3sVg9Ja5UrQJgRbXfbZ+TQ0avk05nbPdxkXLZWX Ht4HaRLBbMpcv3Bg0Ut5Cb1Ql1TP3BVnL8iz4CHg0rSA1ExMP86mxaNsR+Qs9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568933; 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=MeoVz8VJ1L8lwd710tzRiq/1e0JRH/X3krBjVJJMcTI=; b=YMIgsnkRtFu0XqxxcCWubKZqJTBugey+UyZ43o/83eJA9MaBMk95h2Up8JO1X1pGCp+/Vy QDmaU4MBk5Vsi7RE+WSW3jLhFTKbypxN0llD7+3rVq43225rWinTrz5pk11dY6sOUcbXty Y93hUNBwr3TBmje9bcir7trrV0q1YwgSo/oUg0fvHWBBZcsT7Y28Eby/Irx0jsj3y2lTGx 4sw6hlf9HklVpIZXK8RxreYb0xCBuOKIRqOiiR3AoGWif9qHqGw+BnDBXKRQOZFKhnL4ar /325CknGUU8SzvFDRvQEuDTNmmJ6O93ellkNIpmHwKdKyrrzD41ysjubcYUweg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568933; a=rsa-sha256; cv=none; b=MkZgNBV6EEgjz8kfquQRz1PwyCjNnawNOF9UI2A7I94cRSpVrK3RwZBoDGSfLprFEvGjUx nDleE/kvbJs5SOamAveUZROWTLetHtUlC9MQiF38I6zsrWMjfBniprQa+MwD+QHTz3z7Gc fFUPzA08jvNGJ28pzm396x43nHN3xKpI0uC1uLrYwbxf6oWzenPGxfekL0T32PlmVPGOUr 0lOa8h4Xi96L0iTapeK4jJrOS8zV++1JWFGkMfIAvV45Wa8rGjtNJRzVxk0LhgsIiJlr42 vEpRCTONh+LVCCbV8iyjv2jbzU8gqJQbNUkG9nw5FkRBUb59EiveM3alI15pbg== 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 4ZsXS50sWXz1H61; Tue, 06 May 2025 22:02:13 +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 546M2DmV042204; Tue, 6 May 2025 22:02:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Dgm042201; Tue, 6 May 2025 22:02:13 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:13 GMT Message-Id: <202505062202.546M2Dgm042201@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: 171e3706e477 - main - devinfo: Unwind the ternary operator to better fit future libxo structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 171e3706e477076047f7a9dbe4603d2542bb9e65 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=171e3706e477076047f7a9dbe4603d2542bb9e65 commit 171e3706e477076047f7a9dbe4603d2542bb9e65 Author: ktullavik AuthorDate: 2024-10-17 17:25:57 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:45 +0000 devinfo: Unwind the ternary operator to better fit future libxo structure No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1480 --- usr.sbin/devinfo/devinfo.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 306d752e884e..4343c7dd3457 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -80,13 +80,21 @@ print_resource(struct devinfo_res *res) { struct devinfo_rman *rman; bool hexmode; + rman_res_t end; rman = devinfo_handle_to_rman(res->dr_rman); hexmode = (rman->dm_size > 1000) || (rman->dm_size == 0); - printf(hexmode ? "0x%jx" : "%ju", res->dr_start); - if (res->dr_size > 1) - printf(hexmode ? "-0x%jx" : "-%ju", - res->dr_start + res->dr_size - 1); + end = res->dr_start + res->dr_size - 1; + + if (hexmode) { + printf("0x%jx", res->dr_start); + if (res->dr_size > 1) + printf("-0x%jx", end); + } else { + printf("%ju", res->dr_start); + if (res->dr_size > 1) + printf("-%ju", end); + } } /*