From nobody Sat Apr 9 00:27:47 2022 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 1FC1F1AAB8C7; Sat, 9 Apr 2022 00:27:48 +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 4KZwtq5QT6z3p5J; Sat, 9 Apr 2022 00:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464067; 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=o6bA/Mk4CZqmIrNnIHgTBfXnua7rSwU5WvycW4vFS7o=; b=ndkWzA/trJ5Wgyyb+R90nd/71NbgfUlv+8ShNFKWy3+MPrfKu4Qi1dhJesw28cz+Bej6sr IkJQ2nnVec/gH89N+xNvmlu91D89jFhR0q4MWM6oeGT9DeZG/1jXKCEyDAgXw+Wyubc4E/ tlcVDjL/8hUCEY5EKpufhp9V/rdxnU6Y/xExBlIW3TdeHCzBBTopBrsTOvswzd/HzQy9TR p//Tk3GG8gkXsqUbsvl11c5LfsmkMq6b0+UZGYBCFWauXDvmQ1y9y3oXTpgtdwHg+dGdse iZfrsOxa4sFU8lJOU6iZhr1F9Mel5ItHZprCy7RkJKRzNoWGamZ3V7qApfjjsg== 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 81E597567; Sat, 9 Apr 2022 00:27:47 +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 2390RlRT056452; Sat, 9 Apr 2022 00:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390RlXw056451; Sat, 9 Apr 2022 00:27:47 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:27:47 GMT Message-Id: <202204090027.2390RlXw056451@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: d557e89abb43 - main - pf: Workaround set but unused warning. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d557e89abb43c8fadf490a1a5919e9dd184eeaf9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464067; 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=o6bA/Mk4CZqmIrNnIHgTBfXnua7rSwU5WvycW4vFS7o=; b=kZVmm5cZIFYzxrmtumadKUE25fMujZeasVvG1QWmfLSmpwcuWAKQXtUNVUuPlOl2UGmjsz 6G0qylVlPpXqZPaWXk3r5OXJ1EFo1wtTrabpdSLbNeWjT4YhPGGfhz6/L7iJe9l/ZkAYb0 q1mBlR8tdHm/F8GvvT80gcMO2jh8+qO6h1OdK6AgvT3szHuo5JbB6EXOHo/cb7HMLhfd1K AFVeZbuHqUm+igFeGZkt9GJIiLqH3y/+dPI6Cu+5mx5oLb7uap/YK9lMAFxY8zH/RpFlj8 ZaVx+bi2LzpoWxTELQBIweaWW18KwBV9s9fmRGrUBmKMKSBKXPUBPSIrftrnxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464067; a=rsa-sha256; cv=none; b=Gz9A7p2usMs7e7VM+JxihrywhxQ8sDIUoeGGvZ/hodfrOAZEipGdbg4TvkilyoOiw5DFk6 3PzkU5htX9WzDTuYosApkwyswEX7F8Bup0BttYhfbtks9Lgjk1gGZ2Zi+0M/GNqVva5cIr QmaBZ0wUbrp+14cdkfPijdcjPVEX6zrbSSUI0ggCH5zBZ235RdxiBo/zWhcrXajs5rbwRL xMUY3EEWndg8IsnP/zjaH5Kpxuqzj4N53sFfYz3vcIATUKm6GLP8wLo1Lmv2fbo2EHFJ23 eC/chxDcgAiWOCLgA4HR/+uR3Z/ttjGD8axjDItXWBCQcHN7Vs1a9qvhveomeQ== 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=d557e89abb43c8fadf490a1a5919e9dd184eeaf9 commit d557e89abb43c8fadf490a1a5919e9dd184eeaf9 Author: John Baldwin AuthorDate: 2022-04-09 00:25:13 +0000 Commit: John Baldwin CommitDate: 2022-04-09 00:25:13 +0000 pf: Workaround set but unused warning. The RB_NEXT macro does not use its middle argument since commit 5fce408cc44c737267aaaf0dcecd3454ba9089cd in 2004 (which ironically fixed an "unused parameter" warning by introducing this warning in all consumers). RB_PREV has also copied this unfortunate behavior of an unused argument. This results in 'parent' not being used. To workaround, inline the value of 'parent' as the second argument to RB_NEXT. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D34833 --- sys/netpfil/pf/pf.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 027d48c82688..a150c7e86e5e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3371,13 +3371,10 @@ pf_step_out_of_anchor(struct pf_kanchor_stackframe *stack, int *depth, f = stack + *depth - 1; fr = PF_ANCHOR_RULE(f); if (f->child != NULL) { - struct pf_kanchor_node *parent; - /* * This block traverses through * a wildcard anchor. */ - parent = &fr->anchor->children; if (match != NULL && *match) { /* * If any of "*" matched, then @@ -3387,7 +3384,8 @@ pf_step_out_of_anchor(struct pf_kanchor_stackframe *stack, int *depth, PF_ANCHOR_SET_MATCH(f); *match = 0; } - f->child = RB_NEXT(pf_kanchor_node, parent, f->child); + f->child = RB_NEXT(pf_kanchor_node, + &fr->anchor->children, f->child); if (f->child != NULL) { *rs = &f->child->ruleset; *r = TAILQ_FIRST((*rs)->rules[n].active.ptr); @@ -3475,12 +3473,10 @@ pf_step_out_of_keth_anchor(struct pf_keth_anchor_stackframe *stack, int *depth, f = stack + *depth - 1; fr = PF_ETH_ANCHOR_RULE(f); if (f->child != NULL) { - struct pf_keth_anchor_node *parent; /* * This block traverses through * a wildcard anchor. */ - parent = &fr->anchor->children; if (match != NULL && *match) { /* * If any of "*" matched, then @@ -3490,8 +3486,8 @@ pf_step_out_of_keth_anchor(struct pf_keth_anchor_stackframe *stack, int *depth, PF_ETH_ANCHOR_SET_MATCH(f); *match = 0; } - f->child = RB_NEXT(pf_keth_anchor_node, parent, - f->child); + f->child = RB_NEXT(pf_keth_anchor_node, + &fr->anchor->children, f->child); if (f->child != NULL) { *rs = &f->child->ruleset; *r = TAILQ_FIRST((*rs)->active.rules);