From nobody Wed Apr 13 23:09:12 2022 X-Original-To: dev-commits-src-main@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 C66041B40020; Wed, 13 Apr 2022 23:09:13 +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 4Kdyvs1YbPz4lNS; Wed, 13 Apr 2022 23:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891353; 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=YQB/zuez2/roRjJfjFywcNhisMtJ7q70VPOwTvznKk8=; b=kfX1Q3JS4qr8/cz7VpzJRijD7TT5dQaXY23ff9QxWxgRPszfYTfdZ+dePnrd2YUOVGHNJ3 gEEU2Mo8ihWcsJyIyTS4z+6QOcTmPWtoxuIxiOldXaJYCF+tBgFST2ULIIkshBeG4wpk9S VeaF0rd2A4el1snb/pDcowXggarmGekV5An5Lafe+muvNHrmfjRZpB82M3LauPoFiRRiqo /wCy/rA7Ve39PCvquFFFRXqJDCz01l4jLhrk38ryfBQZKAsBSXROFj82WS1fHnvIvVrcbh lV1tBV71cHdFwFq0Kbfp9m6qq7QTazkQeIIastc4g5jd+RKGP+NmAX4pQdpj3Q== 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 EE02115382; Wed, 13 Apr 2022 23:09:12 +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 23DN9Cgk074085; Wed, 13 Apr 2022 23:09:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9CQu074084; Wed, 13 Apr 2022 23:09:12 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:12 GMT Message-Id: <202204132309.23DN9CQu074084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a98bb75f80ba - main - netinet6: Use __diagused for variables only used in KASSERT(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a98bb75f80ba1089abf9054440cd3ad4dee1b557 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891353; 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=YQB/zuez2/roRjJfjFywcNhisMtJ7q70VPOwTvznKk8=; b=rlpJsBDyVm8GZ4Wc4VdUc2tk/DXywWByOYVEJh5maK51fJ3rLMcLq5yklekNG2uVOt0Y5T v6yPd240OdMnX6cJXpiScjn7VrhnQ2xtyqtrY0iPeVEd4dBVQiJ16U9kkv+lvJa2vhAqSe uH7gKEMq1HKnmJHaJkAaEptHf8PnZ00ixAEUHuKBNSrzlXQZkQ5hdmP/Y2KiJfMXGZHkCU v5J7V94enDIA+ZS4v+NSzucEYjAFRzXhF5WN15P5nzE/Z40I7pS2nB4jkh9xXmJpnbqPNq E/3sKCmedtftDc9LdGnPeWjv59xKJmhODf9E+ZQnoPCeA8ftgZUjAMg1OMTxNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891353; a=rsa-sha256; cv=none; b=qMIjoUUKYkmz6PeagKNQqQ6qoZ7Y6EieoL2y8a1ErQld1Dkiyn9/T+iavnRBQDXt4zBCHg mThbx8srShsZzKATyb53K92wMfqGsxSOUI3dtmC063Z3xFuJMhQcpfc4bpFmtGPyl8UFsf R/Ct6HXEXKRqi9Ng03yW2N4eiC72Q13aFuZhaGjltDbBz9fvDu0aJmQLKywLnYfb/kYJ5K WcV9EKGkUeTlBCSVJ6qUsiVSi6zrw59tVPfGmOKKl9DGh73HGWR8SE2Os+jwfoonVtJNLo tjgbaCMjFk3aWxyd9EdFRQO8YqQdyHSzo8SgkOCRGgH/0a1EoKpPcyPgalXbdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a98bb75f80ba1089abf9054440cd3ad4dee1b557 commit a98bb75f80ba1089abf9054440cd3ad4dee1b557 Author: John Baldwin AuthorDate: 2022-04-13 23:08:19 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:19 +0000 netinet6: Use __diagused for variables only used in KASSERT(). --- sys/netinet6/in6.c | 2 +- sys/netinet6/in6_rmx.c | 2 +- sys/netinet6/mld6.c | 2 +- sys/netinet6/raw_ip6.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index c273d74b565c..ba22dbb65e31 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2183,7 +2183,7 @@ in6_lltable_match_prefix(const struct sockaddr *saddr, static void in6_lltable_free_entry(struct lltable *llt, struct llentry *lle) { - struct ifnet *ifp; + struct ifnet *ifp __diagused; LLE_WLOCK_ASSERT(lle); KASSERT(llt != NULL, ("lltable is NULL")); diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index d1c0a83d0002..f5d4a75d7a70 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -138,7 +138,7 @@ struct rib_head * in6_inithead(uint32_t fibnum) { struct rib_head *rh; - struct rib_subscription *rs; + struct rib_subscription *rs __diagused; rh = rt_table_init(offsetof(struct sockaddr_in6, sin6_addr) << 3, AF_INET6, fibnum); diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 15ad5196d205..dae0cea48cdc 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -2242,7 +2242,7 @@ mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli) inm->in6m_state = MLD_NOT_MEMBER; inm->in6m_sctimer = 0; } else { - int retval; + int retval __diagused; in6m_acquire_locked(inm); diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index cb54d1268cef..04137a8ed0a6 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -689,7 +689,7 @@ rip6_detach(struct socket *so) static void rip6_abort(struct socket *so) { - struct inpcb *inp; + struct inpcb *inp __diagused; inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip6_abort: inp == NULL")); @@ -700,7 +700,7 @@ rip6_abort(struct socket *so) static void rip6_close(struct socket *so) { - struct inpcb *inp; + struct inpcb *inp __diagused; inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip6_close: inp == NULL"));