From nobody Fri May 9 22:16:19 2025 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 4ZvNd02DGvz5wCY9; Fri, 09 May 2025 22:16:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvNd00NW5z3RGx; Fri, 09 May 2025 22:16:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746828980; 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=nRPvk5GDMyJ5C5uTlwu4R6jlC/Vb1Yd0c8qjzO8yDpQ=; b=jG+Btvtult4ziCA3JlbAEb6a8RFN55vqDhBm9/kM78MulA8uVkNdN3SM634Y21FdEoK/oT dkGuMaN2b6wqLKOA75OAjiHTJzU8Tufm1tuov4JD4uorty750rcsoM2CNVTxRWeSkFXT3Q Dm2kHxUIy/Ukg58TZe/9TRsAtGBmJI8ufZ+lMHDiZ0tuqfjz6O8O/VQMh6JM7frHCgY+E7 7+otR3WIsh8LMtuMJrNRpzi/SZzvhSCRIKeU+w+woLh5VYu5QXeHnfnNrsjtILRFI5aKqC 268W2jD2YoZLJV9C00ByyW/kqOzd6pZCh/xEtz94aji6NQfTGqt7l1f8XiUZbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746828980; 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=nRPvk5GDMyJ5C5uTlwu4R6jlC/Vb1Yd0c8qjzO8yDpQ=; b=kybQo0Z0tzx1LHLZLc2nn6v9cNNEadX90HhqdkDbY4ihK22Oe5gei3iyQlRQDWtK+snqPp I3qMAE/VCeNJAa5r+jLhit40J1vohvey+0rD9IXP45fTjPbn+/2n7yidmP/yh6PZpA9TgJ n81K6LkEd2NvzouMkKzFeX1slWLaPBtMFsGLMFkROQbX0s6XLS2HG3UtCh/WzoUCNWetdw Mac6VrEljq2M8reBTy1AxRePGE4As+RNS45W3C40LmpCpM9S49LFXoJ3O5TEIzbyBW8wzI Uu3oC74xneS0KVEoRwPrc9vdIsjs2MsGZcJvKu6WTHxalggB7B6x3TUWwV+DoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746828980; a=rsa-sha256; cv=none; b=hD52CiTLveUU931jkCUQ7oFTXOCP1jZap2jDMRP+HQudaOeDzmrosELtd3mUggLB+Psvxh RnZpPQVIguOtneT+ZzkLIzSdY2s/817+rU91pfpMx+kHB0dwfvsbwzklZLZRDOxFXGgpto o8kBlTcBYVpgOeWa6QLY41xS02a2uE5dgteXtJA3ydSw2rS8Tbk5Si9s6IS6qZon8rogdJ FZKneoo/cvqfwT58ZiFKiQ9wFr4clU+4frjEGzHcW/i8VmHtAd9JOlC+VL5cNsKwc/4rQc OBtX0EMVi1jb6zYUBM2PMgQtu0Uuq9UKBIobm6/5ojyslMNcVrkSmVVmbDsvCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZvNcz6wdjz3c5; Fri, 09 May 2025 22:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 549MGJi5062985; Fri, 9 May 2025 22:16:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549MGJJY062982; Fri, 9 May 2025 22:16:19 GMT (envelope-from git) Date: Fri, 9 May 2025 22:16:19 GMT Message-Id: <202505092216.549MGJJY062982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a451bdf25b53 - main - pfctl: clean up TAILQ use in symset()/symget() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a451bdf25b534130d7ec5a6e3ef8e7b33fc6bdd5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a451bdf25b534130d7ec5a6e3ef8e7b33fc6bdd5 commit a451bdf25b534130d7ec5a6e3ef8e7b33fc6bdd5 Author: Kristof Provost AuthorDate: 2025-05-08 15:14:18 +0000 Commit: Kristof Provost CommitDate: 2025-05-09 20:49:29 +0000 pfctl: clean up TAILQ use in symset()/symget() Replace symset()'s hand-rolled for(;;) traversal of 'symhead' TAILQ with more modern TAILQ_FOREACH(). This what symget() was already doing. Add paranoia '{}' around body of symget()'s TAILQ_FOREACH(). No intentional functional change. ok bluhm@ otto@ Obtained from: OpenBSD, krw , 54c95b7a05 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index f1ed5444cadd..befa5a9b0d39 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7178,9 +7178,10 @@ symset(const char *nam, const char *val, int persist) { struct sym *sym; - for (sym = TAILQ_FIRST(&symhead); sym && strcmp(nam, sym->nam); - sym = TAILQ_NEXT(sym, entry)) - ; /* nothing */ + TAILQ_FOREACH(sym, &symhead, entry) { + if (strcmp(nam, sym->nam) == 0) + break; + } if (sym != NULL) { if (sym->persist == 1) @@ -7237,11 +7238,12 @@ symget(const char *nam) { struct sym *sym; - TAILQ_FOREACH(sym, &symhead, entry) + TAILQ_FOREACH(sym, &symhead, entry) { if (strcmp(nam, sym->nam) == 0) { sym->used = 1; return (sym->val); } + } return (NULL); }