From nobody Fri Jul 29 18:47:11 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 4Lvc274qG5z4Y1f8; Fri, 29 Jul 2022 18:47:11 +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 4Lvc274GS1z3nb4; Fri, 29 Jul 2022 18:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120431; 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=HAKYOg0T/QfcKLWxX6AbwHnOt0fsypYkD5re8PEYbo4=; b=JyKlIQ2IFTk8Vf60tbNgoIixzZXH0myI5ggGB0UQrp6wClVHoKI+YPaWA97TNsEO2Ysm6W +4IOBTQYWkNdfmWu90pdFXRZNVH4+yBS8iXKfCAJBn5dCvziRsP8HpsL1pT2j3N7VN9jt0 yLKKK13LMMpZ7DnGb3UoQGFHMxnWPsRbXDY8Ld6hDGy4IrFVRN7yI6AkYSDphZHODXUYXh kkKesy1GrJDkwl7oyPx/E0tcRDJRXIj4os5+z7QXgdTSlmCjkSY9/3ZuGwappeha76KCtW czGFHFakT1blFERpYUpuZwM11CUrKxCyTYAQS8m9j6rlXEQmYnm2tJKPzbtr5g== 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 4Lvc273Hlczlxp; Fri, 29 Jul 2022 18:47:11 +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 26TIlBl5023764; Fri, 29 Jul 2022 18:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TIlBjL023763; Fri, 29 Jul 2022 18:47:11 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:47:11 GMT Message-Id: <202207291847.26TIlBjL023763@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: 6b061a2fde94 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 6b061a2fde94283d03f7aee3f44f6faf16cbc1a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120431; 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=HAKYOg0T/QfcKLWxX6AbwHnOt0fsypYkD5re8PEYbo4=; b=uIOMYYsy3dsqaTgqkpdD7OLLr8xI+vQCKuhTk8a3FeSuceSt7hMvpouKlyAibNC8hPwQaV QD6g5r3t7qJ5NPK5UKzD1jDjM8HLk7MBZn4ZS08kfJBZCU8MgyrXwlGVN5D4wTbO930ygc oa1sqfp45se3g94C9AHwovDOSWlVa7snQn58+xVwn6cJSEtFqJXKCWUHWlj8bxto8SB0sx Om/5J0Yg/X9ihB9dk8t7WaUZ3HBmKSyo20LHNfHiHcaxa2UlhoHV6YPCRy8NgIMp9+tALu +WMSUpIddfBWU/ioKoTQyBZn0aykRnx9VuJSWSROMEwtUUla8y07VJm93X9tZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120431; a=rsa-sha256; cv=none; b=TgH/YlEd4vwVU1iXsrmaBWimKrPnPC6sUoBC3zJ8TTNnEzT3FPU3ilXyoCfr/OWgYci0v+ 3pzcDubaT1AerU4560pdwc63kxE2TR1Gyi4FrEH8oma7uX3y8AHZMUwFoKS8QEJALZNhrr KaYeZoqyU3yVrU38Mh9N4N8CGVFmVZTtb6QJtFG4HpAoc+JrzpYykxNLquABXKP7332Jxa O+1gBZuCu3y9gwBO+QP4Q3ifC7r05jxH5IVxbDoHtLkhJ4XUlMLOFKNvK7HHi1G04+GE04 qE+eTwYxOA9bq/eZV7m+KTgThDYAwqpGGbAfQbBncUIXg+IbwcdGhPP/MWAmUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6b061a2fde94283d03f7aee3f44f6faf16cbc1a2 commit 6b061a2fde94283d03f7aee3f44f6faf16cbc1a2 Author: Dimitry Andric AuthorDate: 2022-07-25 19:50:40 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:28:07 +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 a46264cd3efe..348ad5f83bd3 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -9432,7 +9432,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; @@ -9501,7 +9501,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 */ @@ -9817,7 +9816,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;