From nobody Fri Sep 20 15:58:13 2024 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 4X9H9K6kf4z5XgDc; Fri, 20 Sep 2024 15:58: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 4X9H9K4R46z4dfs; Fri, 20 Sep 2024 15:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726847893; 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=a886d3BbHzJaplr1zZ8R4iVWfkZyfZCiRCEaLX6Smjg=; b=bFSySWz/rCev2Xf8A38HytQdclwPfqWj4SDeBQuN7qMUvAf6RArse4HcZAvQtu01qDLdBb r+jFHzQ+9ButKAoSO7IAAU3gcQxLdoCpExr+F0cIr21uHNwHzYkYdcfqRvJUWXr1KFzvgK Hqx7ctrqXe8AQgQjFDS99JO4p6JWznengy9EYKc/zjhBfbhYcKMzHJkdbAcNnfu2zwGrfq ieZfzWBxuwL1MMM7l53OigpTkfX0Wy9SueKjZlLQQLxYGld98bT0YhN+j03SJEd1SNV8F5 Eg0kV61hFpsHQNNOjlaUI37Zv4DiaX3Hg8u4pQVrC1PH368FxmpEOhaff/qBJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726847893; a=rsa-sha256; cv=none; b=JDj6iczpm29w46OoBDyYlRThufJ4ZjhmFEBvMVB/U2RFDtmiJhH9y0a29ygLfWKYWRwbr+ B1enom3uwukhcbDsmrEjnbIpfowRncl6wYF44bHSfDERFhYTaaeMvU8+RYPMSaY3pIPPR6 /M7FQi0b8CewOLaEfjlzJLntFKjPHJ7+lbbHraumVAsQG7zcLQ5YnjKC/EgPF1Z5YGEw7S JuuQXGdZwqiuBz4zcHR0BpC5wZbPHtq3hRJIIK6vyyrmoeJ/1kHrDREtXLphq+xvju4lRz ZNpi8UON+IK8iJ1SX6JcnELsKC6qxW325vSKIHl9Z2NvNQQpSQQ8j3OGB7zWxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726847893; 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=a886d3BbHzJaplr1zZ8R4iVWfkZyfZCiRCEaLX6Smjg=; b=KvNXNfY3P8akMDbv9KsxhZdhSJ10GBg1/S2PyQMAVXP5o2q23ubdDujSMqwu8OUCDZ2wRb u2bUPrye/S/hVKkI/Lry8S93j4ypnzdqXg51F7gXSfzq2cdLZeeR2Pxr7ZczXj4a2H7QwB xmOKEkhqLaXvqNLrZ2n6Ddg8wwES6oOHetjX9XUpQuWYui/KxR0SheUs5uJvGqBgp/BjcD lHZqmyBPfdVzL+Pm4X/dnn7+qhw48iK3H90sAaK5Ly3m/2gG81jDQP8Yhcl1Mk9Wg+d8ey u9838at73D8OaYi4jCz3N5KUgwnm6hNzOXNbSKgWqn62m/Td77S7B6Be3xGOWQ== 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 4X9H9K41GPzwDq; Fri, 20 Sep 2024 15:58: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 48KFwDZd048985; Fri, 20 Sep 2024 15:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KFwDev048982; Fri, 20 Sep 2024 15:58:13 GMT (envelope-from git) Date: Fri, 20 Sep 2024 15:58:13 GMT Message-Id: <202409201558.48KFwDev048982@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: 14980d69ff0f - main - i2c: Don't print uninitialized data when verbose 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: 14980d69ff0fce53cad8188b4d14fd30ad6b93c0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=14980d69ff0fce53cad8188b4d14fd30ad6b93c0 commit 14980d69ff0fce53cad8188b4d14fd30ad6b93c0 Author: John F. Carr AuthorDate: 2024-05-23 19:50:14 +0000 Commit: Warner Losh CommitDate: 2024-09-20 15:37:58 +0000 i2c: Don't print uninitialized data when verbose i2c -sv or i2c -rv prints an uninitialized field i2c_opt.addr. Suppress the verbose message entirely for scan and reset, where it provides no information, and zero initialize the field. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279261 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1345 --- usr.sbin/i2c/i2c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/i2c/i2c.c b/usr.sbin/i2c/i2c.c index 12155f1a0663..e4a780ba828f 100644 --- a/usr.sbin/i2c/i2c.c +++ b/usr.sbin/i2c/i2c.c @@ -751,6 +751,7 @@ main(int argc, char** argv) /* Default values */ i2c_opt.off = 0; + i2c_opt.addr = 0; i2c_opt.verbose = 0; i2c_opt.dir = 'r'; /* direction = read */ i2c_opt.width = "8"; @@ -875,12 +876,6 @@ main(int argc, char** argv) return(EX_USAGE); } - if (i2c_opt.verbose) - fprintf(stderr, "dev: %s, addr: 0x%x, r/w: %c, " - "offset: 0x%02x, width: %s, count: %u\n", dev, - i2c_opt.addr >> 1, i2c_opt.dir, i2c_opt.off, - i2c_opt.width, i2c_opt.count); - fd = open(dev, O_RDWR); if (fd == -1) { fprintf(stderr, "Error opening I2C controller (%s): %s\n", @@ -890,6 +885,11 @@ main(int argc, char** argv) switch (do_what) { case 'a': + if (i2c_opt.verbose) + fprintf(stderr, "dev: %s, addr: 0x%x, r/w: %c, " + "offset: 0x%02x, width: %s, count: %u\n", dev, + i2c_opt.addr >> 1, i2c_opt.dir, i2c_opt.off, + i2c_opt.width, i2c_opt.count); error = access_bus(fd, i2c_opt); break; case 's':