git: 61cc49884d26 - stable/12 - Fix unused variable warnings in sctp_indata.c

The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=61cc49884d268d4b7f71645fe81f5af544b55433

commit 61cc49884d268d4b7f71645fe81f5af544b55433
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-07-25 19:15:52 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-07-29 18:35:36 +0000

    Fix unused variable warnings in sctp_indata.c
    
    With clang 15, the following -Werror warnings are produced:
    
        sys/netinet/sctp_indata.c:3309:6: error: variable 'tot_retrans' set but not used [-Werror,-Wunused-but-set-variable]
                int tot_retrans = 0;
                    ^
        sys/netinet/sctp_indata.c:3842:20: error: variable 'resend' set but not used [-Werror,-Wunused-but-set-variable]
                int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                  ^
        sys/netinet/sctp_indata.c:3842:47: error: variable 'acked' set but not used [-Werror,-Wunused-but-set-variable]
                int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                             ^
        sys/netinet/sctp_indata.c:3842:58: error: variable 'above' set but not used [-Werror,-Wunused-but-set-variable]
                int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
                                                                        ^
    
    The 'tot_retrans' variable was used in sctp_strike_gap_ack_chunks(), but
    refactoring in 493d8e5a830e got rid of it. Remove the variable since it
    no longer serves any purpose.
    
    The 'resend', 'acked', and 'above' variables are only used when
    INVARIANTS is undefined. Ensure they are only declared and set in that
    case.
    
    MFC after:      3 days
    
    (cherry picked from commit 05b3a4282c408f495add570bbca12242dd006279)
---
 sys/netinet/sctp_indata.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 70398c0777b1..6ef1bef668b5 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -3321,7 +3321,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
 	struct sctp_tmit_chunk *tp1;
 	int strike_flag = 0;
 	struct timeval now;
-	int tot_retrans = 0;
 	uint32_t sending_seq;
 	struct sctp_nets *net;
 	int num_dests_sacked = 0;
@@ -3711,7 +3710,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
 			}
 
 			tp1->rec.data.doing_fast_retransmit = 1;
-			tot_retrans++;
 			/* mark the sending seq for possible subsequent FR's */
 			/*
 			 * SCTP_PRINTF("Marking TSN for FR new value %x\n",
@@ -3856,9 +3854,10 @@ static int
 sctp_fs_audit(struct sctp_association *asoc)
 {
 	struct sctp_tmit_chunk *chk;
-	int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
+	int inflight = 0, inbetween = 0;
 	int ret;
 #ifndef INVARIANTS
+	int resend = 0, acked = 0, above = 0;
 	int entry_flight, entry_cnt;
 #endif
 
@@ -3878,13 +3877,19 @@ sctp_fs_audit(struct sctp_association *asoc)
 			    chk->snd_count);
 			inflight++;
 		} else if (chk->sent == SCTP_DATAGRAM_RESEND) {
+#ifndef INVARIANTS
 			resend++;
+#endif
 		} else if (chk->sent < SCTP_DATAGRAM_ACKED) {
 			inbetween++;
 		} else if (chk->sent > SCTP_DATAGRAM_ACKED) {
+#ifndef INVARIANTS
 			above++;
+#endif
 		} else {
+#ifndef INVARIANTS
 			acked++;
+#endif
 		}
 	}