From nobody Fri Jan 13 21:24:43 2023 X-Original-To: dev-commits-src-all@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 4NtvZM2x2nz2qkXW; Fri, 13 Jan 2023 21:24:43 +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 4NtvZM2Fpvz40Kr; Fri, 13 Jan 2023 21:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645083; 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=2D9R+J9kRpmyOcOouVKXjUHvGwHg1M/pf91fHdf2Opk=; b=yfhksldV4E1Of16rCTYsWYZ57/OaiMiHhdKuCmVBTXiMXbHxZwNqdHwHQ1Rota4nODpGL4 U2njaEl82XiUi3z7yNP1ioQuUQMH2LMBEgluQGP3fszDZ4b3XCiiQGrz9egKcsT6TixcwD d3g9e+7q/sBQ2Mw4gSrTD2d/3Vm67LytbCtI1P3KR5gtA18sD8Et2Dh8UEsF0JjFDFD+re rCYKnkhYJCil7kEdHTfAAX9wPKcTdmi1hV5JytW2ykdR+CTFIlyZB4dKWg8g2Yuhtl5u/Q 8TzwDi+QIrOKnv0EUoaHH09+VvWKQoZfhjaZrWlIu55zZ1ZgrrT1FKU17ckIKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645083; 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=2D9R+J9kRpmyOcOouVKXjUHvGwHg1M/pf91fHdf2Opk=; b=GIPmLRCBqkO2PdXgkSvJjwLsgeB0IIjvnP/19DOhm+nLvPbOD3TyDZppZi8emqXmxXCgVp l+8eN1e3g2u7sccZDNUHL1yJo9VvkUNkCMU/WW3pxtOg0XO6idz3YHiWD3xLjpNHh4i0ZL PVyzoQhjdsV3AXloRM4QFjGZtW58iYddaixeb93GfnLtHBNjAojaPQzss/jZpjVJMd0nG7 jLEBoZPdaWxDVJ3UyaCe38DHDdKTWiZnN5LkVh3YQUer/tJUWfIVo0sYCCeGgd71lDpWQ+ hGwH05sDFnjTBJprumk70YwRMXtx6iK0bVuQ4efRgquok773JTGNwb2VsjnqkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645083; a=rsa-sha256; cv=none; b=GDfH7umsex1zogMZxne76Tz8jmiMOA6i/MtH9QnM7ZURDnAo4Xla41RD8SNB5bfb1k8J8Z gKB2U8bFTvBuLIw/5N+2cXz/M1AbIwOfRzQ6Wy44eTyxP9REtQOpaKJVsDSJbqrdgEz/Ty 6K/pQHxdKTg6ZV2GqzdYWklq2DxRHxpXOUi11/4bzgqpuNTSMPc2wTVri3Wq2ESEa7LrB/ 2eNcNJ/6G8zDr8HcWo8mNbC7DfrNtaIApNtkBNOOUsMIwaqUiev6gPBIn2ZF+Ptv5+mGQ+ ioVDOb9iaK+5xAgFDqACVNo67bPQYB1qqfkuFQOGMvltEr7dC7RVuXevGEA8Fw== 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 4NtvZM1LrWzN2D; Fri, 13 Jan 2023 21:24:43 +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 30DLOhG1040409; Fri, 13 Jan 2023 21:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOhBw040408; Fri, 13 Jan 2023 21:24:43 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:43 GMT Message-Id: <202301132124.30DLOhBw040408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3cb0bc54ec48 - stable/13 - net/route: Use __diagused for variables only used in KASSERT(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3cb0bc54ec48fb09daf303470d3077684abc939e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb0bc54ec48fb09daf303470d3077684abc939e commit 3cb0bc54ec48fb09daf303470d3077684abc939e Author: John Baldwin AuthorDate: 2022-04-13 23:08:19 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:25 +0000 net/route: Use __diagused for variables only used in KASSERT(). (cherry picked from commit 2174f0f2f25310308f92743da849fee32c65db8a) --- sys/net/route/nhgrp_ctl.c | 2 +- sys/net/route/nhop_ctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/nhgrp_ctl.c b/sys/net/route/nhgrp_ctl.c index 91ce5b3f4174..ee3ac9bec3d6 100644 --- a/sys/net/route/nhgrp_ctl.c +++ b/sys/net/route/nhgrp_ctl.c @@ -306,7 +306,7 @@ void nhgrp_ref_object(struct nhgrp_object *nhg) { struct nhgrp_priv *nhg_priv; - u_int old; + u_int old __diagused; nhg_priv = NHGRP_PRIV(nhg); old = refcount_acquire(&nhg_priv->nhg_refcount); diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index eadb053c0f42..d35ad0213bb3 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -631,7 +631,7 @@ destroy_nhop_epoch(epoch_context_t ctx) void nhop_ref_object(struct nhop_object *nh) { - u_int old; + u_int old __diagused; old = refcount_acquire(&nh->nh_priv->nh_refcnt); KASSERT(old > 0, ("%s: nhop object %p has 0 refs", __func__, nh));