From nobody Tue Dec 19 09:37:13 2023 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 4SvWn53t9Kz54x00; Tue, 19 Dec 2023 09:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SvWn53Rk2z4N8T; Tue, 19 Dec 2023 09:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702978633; 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=bHbST2GYcz8tOhvLxEu5cQuCXtYY5UNT4lQ7LJpfkJo=; b=ikXL3qeX2kY/Qp1wu8Yh+9zc8kDrncyao4n0lZZ8DWPza1n2/8zIre5EVC5tqP+JIeJvkq BhAJk8Q96/vQHo6FhIw0SlgIYbl61SewXICTZdKMmwolDDbVAJB8bM1T17habTFQGVAnGa anUbCYhEjyRNj/UcM3+uS7fANGnTmAqlXbLimoiZcD5joDUcKiqdhnCJLb1Y0AoXjmEhJY aai0RSZ1G74XKqQNaDOC9vuECcHY2iThz9xAcZUaOINq5dhCOAjQtYlKAf6eq8kQTYghZd kzlHiW8Jqpfg5GwvttCW3G/T2HRhTwpUh5XJ8AX8xhQJ9T13wuLQxhQM4fqL2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702978633; a=rsa-sha256; cv=none; b=GdvK2jirh42eOFviGRdoxiz1DmW/FD8rO0ds/Xfz2b3OShnNwS++ud+bbHAntXD0RItRwu tkrFbDADeuCuQ4PMUE6Be5LghT+OSft+vBtoSAf3/ZjVCNaEN1DceLUC3/hv1qLHlyY5yD 1Fc9wf7pTeYYbiOj1pVP5GSxrBeTAYsFFiOoLUbOV2ELWnaQ2LOp2oYlaUl8aqeVHhWT0H abQqLZ7ouGctZC5ah9qiHgBC2hfpuNMWN28Wa8hdY6IrLS/UjszLesiU0BFQ0WBWiKaSGM LZgqZt5IPK9ZwqaFfsax9exWrv+x8bHf+l/wL/AsClG9gx/MdQo4gRWPGEiUYg== 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=1702978633; 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=bHbST2GYcz8tOhvLxEu5cQuCXtYY5UNT4lQ7LJpfkJo=; b=TR31G54QKm7y2JhYwDWkEtsqoG+yeVLYORHVlRf6V7QniaQj85ZF5OqsLYv7vNrKasN0Ai +dolEiTwkWQIRRU6DRMrkqqutnWU+Ben0mRhGBEEB2jOmYpUNM46O5v4hpdbYYXpt7kpIt xWJXKZBjZp9rq9DU22gS9f9J7JnfponEgFeC8hDGihTxw3Ssjry3ZLATrxEMloBipLu77x 7tol1ZmHzXnc5J7hLgpXuLCVUIq0wCjCckWQ1hD8EMlKUvy2RMrsnEUk6FOXg0Hwf+Sczb uIHmfZUIqUu0e8ihsR94Oi9KW1B/HgCoCZYJ6AVgQC7VwIp7t7xUkZCIfMq0vg== 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 4SvWn52TxDz100n; Tue, 19 Dec 2023 09:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BJ9bDbM029967; Tue, 19 Dec 2023 09:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJ9bDkL029964; Tue, 19 Dec 2023 09:37:13 GMT (envelope-from git) Date: Tue, 19 Dec 2023 09:37:13 GMT Message-Id: <202312190937.3BJ9bDkL029964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 2134b35e0f71 - main - stress2: Fix "-Wunused-but-set-variable" warnings. Style fixes, while here 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2134b35e0f71a7cafa3602a4d362ee7ef8b65ebb Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=2134b35e0f71a7cafa3602a4d362ee7ef8b65ebb commit 2134b35e0f71a7cafa3602a4d362ee7ef8b65ebb Author: Peter Holm AuthorDate: 2023-12-19 09:36:41 +0000 Commit: Peter Holm CommitDate: 2023-12-19 09:36:41 +0000 stress2: Fix "-Wunused-but-set-variable" warnings. Style fixes, while here --- tools/test/stress2/misc/fcntl.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/test/stress2/misc/fcntl.sh b/tools/test/stress2/misc/fcntl.sh index 39f7f87dc005..237cacdf6de8 100755 --- a/tools/test/stress2/misc/fcntl.sh +++ b/tools/test/stress2/misc/fcntl.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# fcntl(2) locking scenario. No problems seen. +# fcntl(2) locking scenario. . ../default.cfg @@ -45,6 +45,8 @@ rm -f /tmp/fcntl exit $status EOF #include +#include + #include #include #include @@ -52,7 +54,6 @@ EOF #include #include #include -#include #include #define PARALLEL 16 @@ -80,9 +81,10 @@ add(int n, int increment) { struct flock fl; off_t pos; - long val, oval __unused; - int r; + long val, oval; + int debug, r; + debug = 0; /* set to "1" for debug output. */ pos = n * sizeof(val); memset(&fl, 0, sizeof(fl)); fl.l_start = pos; @@ -107,10 +109,9 @@ add(int n, int increment) } oval = val; val = val + increment; -#if defined(DEBUG) - fprintf(stderr, "add(%d, %d) @ pos %ld: %ld = %ld + %d\n", - n, increment, (long)pos, val, oval, increment); -#endif + if (debug != 0) + fprintf(stderr, "add(%d, %d) @ pos %ld: %ld = %ld + %d\n", + n, increment, (long)pos, val, oval, increment); if (lseek(fd, pos, SEEK_SET) == -1) err(1, "lseek"); while ((r = write(fd, &val, sizeof(val)) != sizeof(val))) { @@ -178,9 +179,9 @@ down(void) int main(void) { - int flags, i; - long val, sum; off_t len; + long val, sum; + int flags, i; signal(SIGHUP, handler); signal(SIGALRM, ahandler);