From nobody Sun Apr 09 21:35:34 2023 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 4PvllC6L1rz44JY4; Sun, 9 Apr 2023 21:35:35 +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 4PvllC3PyTz4MrD; Sun, 9 Apr 2023 21:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076135; 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=5V6wThQlLNsLFmRdp0gT6TcVaQfDQrv2xbgo/9KpTG8=; b=P/SWIIcYSeLuGw4Y5+Oz8Hx0rfKa2Npfj5WXk2MmzgkGvIQx3uNG77hld/vI5K9/fxo0s2 cFTFnW8EGMMCmr1oTLI6FLMy3HMTDsMZ9S1U153PLDFFRQz6orjoS79kQxsCxR8GybeFAs 4e5cP8upq1O3IEvkCWpv2lb4ZyYkpWpq/8tg3UDrrWa1BPOI8H5dYXVbTsl+BMdgBFgrw1 8VLE4P42dsI6D1jOPshZs4x18yPGz0LZ1cErKRgoSFNZ0Ru4SSyQpZL9gaLn4dBeKrfHId 7H3uyiiG62ODr1vgvMjlm5Sspp/UfnHduZRYKr4N2X2Hv8UVnTg7m1zZKdi4JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076135; 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=5V6wThQlLNsLFmRdp0gT6TcVaQfDQrv2xbgo/9KpTG8=; b=bwxhQW9SkYAL60w7cAQQ38BJ8elFP1c7nyph3onAOAMyOj9lQcU+QIOKFvKYhs01jIUqVg P9GL/M1fwOBsVSD3OyTbouHWUYgAsII3Gbs6DMjJ4MdjQNfa8kY10E/kLKwj/xusV1V7HZ Oxwpn9fYEj3gk69nK2IqV3x9vmePf7Tj83TqQkLOtTcuSevZqOMJ8gF4arfZR5TqC20Rlb yDa+XlT67wp5bN+2pnOf2vOzZCjo+7clnwLQ+2Uzr+oAl71UzSHfkeYQJm1ClBOmqaZThP LCxocNvlvk1tUgidmrJrwfehdfXI7zMJfEW0GI83wuMBeqhZFZxpff//kXIkyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076135; a=rsa-sha256; cv=none; b=IXeROSXP/F+5Pd5FxAWg/0Sah1EAWl6/VmjXuQhs7NQuPmgmtp36kMRx+R/qDfow7zakNB kzhMxqpNsG7rWRJjH1t/1slV5g10NdCeeUdlnH5YWO1vC6HYqNegi+Aikf6soRo8a11Gjg kFBSmSFh5mOceNr1X1gAXC02bBa1vnDuHVgU45M7ndgcwXY8WLaGJF+Ts76mdRjRrHso59 9z9o209PvO+05Xeq7pqH26sH4xOlEkNd9S/NnHmGxbAA4s3v3pVK8yDEl6ytqX6dDvnkuE WrxJNAZ7B+tG9hMWzD9ScBuuK6kNJ9Bm1ENGTziiJs2FdVZYzOoD8lYPqPSeEw== 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 4PvllB6WKFzPkl; Sun, 9 Apr 2023 21:35:34 +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 339LZYCd081868; Sun, 9 Apr 2023 21:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LZYRk081866; Sun, 9 Apr 2023 21:35:34 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:35:34 GMT Message-Id: <202304092135.339LZYRk081866@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: 482a0e57303c - stable/13 - Fix unused variable warnings in sctp_indata.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: 482a0e57303cc392fdcdeb53d4ef6adbaaba74c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=482a0e57303cc392fdcdeb53d4ef6adbaaba74c2 commit 482a0e57303cc392fdcdeb53d4ef6adbaaba74c2 Author: Dimitry Andric AuthorDate: 2022-07-25 19:15:52 +0000 Commit: Dimitry Andric CommitDate: 2023-04-09 15:20:16 +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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 } }