aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2022-07-25 19:15:52 +0000
committerDimitry Andric <dim@FreeBSD.org>2023-04-09 15:20:16 +0000
commit482a0e57303cc392fdcdeb53d4ef6adbaaba74c2 (patch)
treee4ecf623c0bcb86120fd05c507964ab1c0ce9713
parent6f2a60511cefcd38cb59c2368844861c95f65f64 (diff)
downloadsrc-482a0e57303cc392fdcdeb53d4ef6adbaaba74c2.tar.gz
src-482a0e57303cc392fdcdeb53d4ef6adbaaba74c2.zip
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)
-rw-r--r--sys/netinet/sctp_indata.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index b8bfaf164904..aa6787257a13 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -3837,9 +3837,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
@@ -3859,13 +3860,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
}
}