From nobody Fri Jul 29 18:48:18 2022 X-Original-To: dev-commits-src-branches@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 4Lvc3Q4bDmz4Y1b5; Fri, 29 Jul 2022 18:48:18 +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 4Lvc3Q47Syz3sDs; Fri, 29 Jul 2022 18:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120498; 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=0FpdL5D7cacRJ6TeHHOvgXD0rpjvuNkDVtDnwZw0TRs=; b=eN5oI0zO1OuIIy2d89O+ght13qsQ9tyCPXZihEEwGuUXPcdF61xTM5h2lpSKwphGblbk4V h76Enrpq9SwMQ1S2nmlCs4lD25eU4tp8NFIEw7v54GB66VsqHKsQ/YCdSTjsNMC8+K+dDJ Om5Of7JerhvHnk0JBcZjEEWJJ3z4M6RPgoLmjGRCmEKgeIk5HZvNgWKj0AXddkd+YrOFmL vLXGhpIzaSiU4ONNerAGJRllf1ragGmhYEU5EzEVDm6UKGS4qlpVvGrZFrzQNdimJ4ptKL mD9WZMkXzcIvoz2KqveSleoDsZCehx+LSfvry1yP47j9nCgrGtgGxJs/RZgw4Q== 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 4Lvc3Q3CvVzlRb; Fri, 29 Jul 2022 18:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26TImIdW025199; Fri, 29 Jul 2022 18:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TImI70025198; Fri, 29 Jul 2022 18:48:18 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:48:18 GMT Message-Id: <202207291848.26TImI70025198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8dd6ab0fd096 - stable/12 - Fix unused variable warning in sctp_output.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8dd6ab0fd0966d3ef22f3b475dc6f50bdff5ee7b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120498; 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=0FpdL5D7cacRJ6TeHHOvgXD0rpjvuNkDVtDnwZw0TRs=; b=lzAtglvTbB1K8HkqwYH8R25dTGXmT/mTvfTuKzhik9JOeSO9b0haT6Du9k95s8a2ZC0uX2 mbPx2p9JLxz1PbwdqDwua4yHiFFasNJ4HNXzsfcxslZAgnoqa6CITJRVQHg3EQ3retMPI8 q6kyuyIVf1SdEkYO10XccvQwmV6z6H5VYsZ9Czf6EWys8epyFgETPD1bj2NznclYxq4E7g qYoquyShYiWBO1QlSyCzk7Sndh6aWSAE+IuzivuNTeF8q7FMRj2BrpTs4ea5KJxirwbZg2 e2CzCqhUNFkl4BaHJ33jWd42oaKO2HHGrVeea3kJ8rDmBbXsXjIF/KO1OUHHZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120498; a=rsa-sha256; cv=none; b=OyxAXryx9M4kwci+mUdeP2EQ39y4QH5KNdi1OG94uxFb5uZ5EXv6YEvCBMlKvqbtw2kVYx zGa4/88bt2MExtpd/0sRreDOOx1XEJdcPSFqTfvQNhXfDqXr5vVg875URaIsov3yVtrDrV 2up6S3mmi7GjMFo5I4U5QfGMYPzSWo3sZlSKRmaTQ9EIyxlyaVmJMfhEINir0A8AVDcpVE MvLJl8QyRkL0kZ+TJjmLL2VqRnaHB6+T9PG/jU0z77Ii11+Xn+YdWAZLP7OjbnHDzBKMpu tTwWTfXAVTeE8b61JpCEKneyzD5NtwBykOE+k2C4OPA+EdPgcJOC2psiWmfTzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8dd6ab0fd0966d3ef22f3b475dc6f50bdff5ee7b commit 8dd6ab0fd0966d3ef22f3b475dc6f50bdff5ee7b Author: Dimitry Andric AuthorDate: 2022-07-25 19:50:40 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:35:36 +0000 Fix unused variable warning in sctp_output.c With clang 15, the following -Werror warning is produced: sys/netinet/sctp_output.c:9367:33: error: variable 'cnt_thru' set but not used [-Werror,-Wunused-but-set-variable] int no_fragmentflg, bundle_at, cnt_thru; ^ The 'cnt_thru' variable was in sctp_output.c when it was first added, but appears to have been a debugging aid that has never been used, so remove it. MFC after: 3 days (cherry picked from commit 9057feddc4b05d2b2b29e4db274c28af3d574d76) --- sys/netinet/sctp_output.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index 4277caa0f070..0fee3fa369e7 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -9411,7 +9411,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, struct mbuf *m, *endofchain; struct sctp_nets *net = NULL; uint32_t tsns_sent = 0; - int no_fragmentflg, bundle_at, cnt_thru; + int no_fragmentflg, bundle_at; unsigned int mtu; int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; struct sctp_auth_chunk *auth = NULL; @@ -9480,7 +9480,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, } } one_chunk = 0; - cnt_thru = 0; /* do we have control chunks to retransmit? */ if (m != NULL) { /* Start a timer no matter if we succeed or fail */ @@ -9796,7 +9795,6 @@ one_chunk_around: /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ /* For auto-close */ - cnt_thru++; if (*now_filled == 0) { (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); *now = asoc->time_last_sent;