From nobody Mon Jul 7 15:07:51 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 4bbSKM6xvvz61w2p; Mon, 07 Jul 2025 15:07:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbSKM4ZZVz3wHV; Mon, 07 Jul 2025 15:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751900871; 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=mMzdRdJZk64YxwkBXCn8MFATazsQBb5sDUoW5sy+O08=; b=hSbeGGQN9m3PL+HDTz/BYVDn40MKKeu5Q7bobebLMZ1LFyLRXocFDzPr+cdsqjlUph4uL2 hwZyy2hJD2N7fpTYXakIcHMcAjJyeNkuMOp2y/PcKBtuy60C8pXsXHrXb0Rj/rQsS5Ra2Y RgrEptFiHXDoxpmQjinm6MfzVBgM4IudLlKIZEzFYLuer+Rrjpc9WsQ3lpqW2o7QcM2ns2 e/ifAop6catEip/HcsAKXn5pmaacHAzkAiLU0Od3sR0lNz+Z4qkQ4xcswKddNuBQDRZmab HD+dEkKeJMLnt4NZFFJW5eX0sg3F5zsWulUn48QwAjPftYS8ATOto4B0zF5j1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751900871; 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=mMzdRdJZk64YxwkBXCn8MFATazsQBb5sDUoW5sy+O08=; b=mfkWD6b0Ia/Ep+eDhf5PYDvY+aA7QKs+/BFXV4BiO5uUM/mg7u5l8jsUbbFECPJjyw1hY6 +THn7Kgh0FqA+FUJcbLuvFAbCmEsFmQYdWZEaxUtPKIyHjihQBt8N+GfrQF3/9mv7qWhZX kPPSUA1hlvPNCBJhB5JZp2GLFh03NmRsomnawTMPods2Xp9Cgvq+nNz74Zz8Ey5D4RiaKf QTOQ8upvPNhyh8tU4YHTzCtMARRuXHQC1iisFxGfS3cp7Oh/GIBJwyc8/Y0DHd9qcK60TK QieLIOYneWZXwMGbF8GZJB6nThLDXpou93MAzH674fUCl8m1bcTJ2kiTTH7yvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751900871; a=rsa-sha256; cv=none; b=fsihws7rdqUxYhMxKlN+poFbqrSvX9AKpaVzNeyVwsVWpnyDYX12xNz8TVVUIHnFP+I+Le QkXd7B8aK6GFkgQv2xzsK1xXBCgTcV3JaE08nzDWLSSXWR0l998IYtBXBHRMRhXTbcsDlJ 54ajtMY2XdZvlzV/fCNSaEngpG9P/kqjxra1VUuceSKVPrttofkpHcu/0KrmoKKz6wC3ds KbSUVgx5AsTKF6TJFTQAuZxzKziiVD+bzZKe7WOmqzOSaO0meyB1Gxkj50s95CgvoxZKXZ AxZeUS6fMzFYQQV/B1VE9wZl/8BF/yii/BaaFLbzaiD5BsHV8AJhlDNEOcX8vg== 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 4bbSKM3DZxzwKH; Mon, 07 Jul 2025 15:07:51 +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 567F7pRY016476; Mon, 7 Jul 2025 15:07:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567F7pQv016473; Mon, 7 Jul 2025 15:07:51 GMT (envelope-from git) Date: Mon, 7 Jul 2025 15:07:51 GMT Message-Id: <202507071507.567F7pQv016473@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: b38e96f0232e - main - pfctl: Use mnemonic PFCTL_SHOW_* macros 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: b38e96f0232e1bb353ca556ace6c1885db879289 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b38e96f0232e1bb353ca556ace6c1885db879289 commit b38e96f0232e1bb353ca556ace6c1885db879289 Author: Kristof Provost AuthorDate: 2025-07-01 10:12:34 +0000 Commit: Kristof Provost CommitDate: 2025-07-07 15:06:49 +0000 pfctl: Use mnemonic PFCTL_SHOW_* macros Terminate string with null character. Tweak spacing while here, no object change. Feedback and OK procter, OK sceloha Obtained from: OpenBSD, kn , 2706705609 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 169b75f202d1..f133a106c69c 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2115,7 +2115,6 @@ pfctl_load_ruleset(struct pfctl *pf, char *path, struct pfctl_ruleset *rs, } } else if (pf->opts & PF_OPT_VERBOSE) printf("\n"); - } if (pf->optimize && rs_num == PF_RULESET_FILTER) @@ -2958,7 +2957,7 @@ pfctl_show_anchors(int dev, int opts, char *anchorname) errc(1, ret, "DIOCGETRULESET"); if (!strcmp(pr.name, PF_RESERVED_ANCHOR)) continue; - sub[0] = 0; + sub[0] = '\0'; if (pr.path[0]) { strlcat(sub, pr.path, sizeof(sub)); strlcat(sub, "/", sizeof(sub)); @@ -3307,12 +3306,14 @@ main(int argc, char *argv[]) 0); pfctl_show_nat(dev, path, opts, anchorname, 0, 0); - pfctl_show_rules(dev, path, opts, 0, anchorname, 0, 0); + pfctl_show_rules(dev, path, opts, PFCTL_SHOW_RULES, + anchorname, 0, 0); pfctl_show_altq(dev, ifaceopt, opts, 0); pfctl_show_states(dev, ifaceopt, opts); pfctl_show_src_nodes(dev, opts); pfctl_show_status(dev, opts); - pfctl_show_rules(dev, path, opts, 1, anchorname, 0, 0); + pfctl_show_rules(dev, path, opts, PFCTL_SHOW_LABELS, + anchorname, 0, 0); pfctl_show_timeouts(dev, opts); pfctl_show_limits(dev, opts); pfctl_show_tables(anchorname, opts);