From nobody Sat Jul 12 13:38:50 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 4bfV6M1h5dz61sd2; Sat, 12 Jul 2025 13:38: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 4bfV6L2Gjhz3CYL; Sat, 12 Jul 2025 13:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327530; 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=ka51YlIwpHBu8/RDRMHa4pZQgf6BLPr79ACE7n0R6dQ=; b=wZdtJCtZFEvHyJSd/Y2BhkkJFLOhAEf5wbAq3HH7nTMsH8n23l4+lHe3eH88tLnnd6XP2F +zSr7HG2x7yt4juQaGuXj13UWniDeRu2TO/6nRpEzrT9ILRr5BM8DtTYWeATgKwFuPteIP cuuSvuZcZXzUZ+7J53abAfx4cqXUWG1bxs6LQwpC2hEgXwcKxQdLqRH5HsUaZEz6+8IK6K mWLdyWIpzMtg0WNEBHqkDaC+BY0LmNcRy021USawLxGv++TXemyIpSntHugKgPxRiC3JSy GjeZ9Mf2BT1LKXGCuBWPEH33tJtQSkxFaVcRrthNdFpOOEasYbOapFsjnKxMEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327530; 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=ka51YlIwpHBu8/RDRMHa4pZQgf6BLPr79ACE7n0R6dQ=; b=vH7OJJETelNnYRVcp9A1GWKR70qDcoHSirSRZdV55Kzn8ZxcwJoT+IlsGMZJhzU+CN0hRC A4A7ekYlRjK3vso9o/GlMALoO3+CJftIb4yav2P274XSLrZiBF85dH1w8JCP7aBzQIMT0g eemhkUB9QWlFzgk6nPj8zvtYNKfv5xXwTSPRgGJ4+7gqeeHLAVPlAdsmhuAIvQ9yyVIbEw ta97yqWJhYEbial7j/ct1CS7hw2i9odQZHCkVCLzKCovWKXLmAFfDh4s8Krf5+RYU4wLwU B/JYaibVrG0X0+OW2PJBAV4bsH2X3gR581FYpfvSL3mzWrCugMxTNweOpu2/2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327530; a=rsa-sha256; cv=none; b=oKM9VpcHnn30G1LxArqZkGF1YsPzpX4N72RHmnJvACEqzXX1qJI+FBnt7Z1dWaWNzmx4T7 K+Fu1wtMBEdS96QzP1VnsZt+dygjPazkxGKpHQeVAfHKfdqu0ouRMEFDKh2mllGIwFSn2Q aNT958mLm7nVsxYx2tFbQfuZMxj2OSV3zhtjf8FS3l7VvAhtV5ivM3SclleyKDfXXrX6Q/ 1Ol4kDkGTM/dDroCxLO658PnvNEVE90xax/6s+F5tOHw90r2wRVMVsCosw9EQxTcUCxfvw 0mAY/XeoQtVQOiVis/mcTgfAUFryS9rEFnReWnKgOREI8/LCFYZ7UzulEcLY5g== 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 4bfV6L1mrPz8sg; Sat, 12 Jul 2025 13:38:50 +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 56CDcowP088889; Sat, 12 Jul 2025 13:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDcotK088886; Sat, 12 Jul 2025 13:38:50 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:50 GMT Message-Id: <202507121338.56CDcotK088886@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: 004062345bbf - main - pfctl: Do the actual pfr_strerror() to pf_strerror() rename 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: 004062345bbfaa191252ac2df15ca151dcfdfc4f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=004062345bbfaa191252ac2df15ca151dcfdfc4f commit 004062345bbfaa191252ac2df15ca151dcfdfc4f Author: Kristof Provost AuthorDate: 2025-07-07 07:07:31 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 09:57:50 +0000 pfctl: Do the actual pfr_strerror() to pf_strerror() rename Missed in previous Obtained from: OpenBSD, kn , c802a0d9d6 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- sbin/pfctl/pfctl.c | 12 ++++++------ sbin/pfctl/pfctl.h | 2 +- sbin/pfctl/pfctl_optimize.c | 4 ++-- sbin/pfctl/pfctl_table.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 28f461bf715d..2188324c15cb 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -5458,7 +5458,7 @@ process_tabledef(char *name, struct table_opts *opts, int popts) name); else yyerror("cannot define table %s: %s", name, - pfr_strerror(errno)); + pf_strerror(errno)); goto _error; } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index b4453c850de4..10f3ee1f44e9 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1350,7 +1350,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, for (nr = 0; nr < mnr; ++nr) { if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0) - errx(1, "%s", pfr_strerror(ret)); + errx(1, "%s", pf_strerror(ret)); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("anchor \"%s\" all {\n", prs.name); pfctl_show_rules(dev, npath, opts, @@ -1365,14 +1365,14 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, if (opts & PF_OPT_SHOWALL) { ret = pfctl_get_rules_info_h(pfh, &ri, PF_PASS, path); if (ret != 0) { - warnx("%s", pfr_strerror(ret)); + warnx("%s", pf_strerror(ret)); goto error; } header++; } ret = pfctl_get_rules_info_h(pfh, &ri, PF_SCRUB, path); if (ret != 0) { - warnx("%s", pfr_strerror(ret)); + warnx("%s", pf_strerror(ret)); goto error; } if (opts & PF_OPT_SHOWALL) { @@ -1565,12 +1565,12 @@ pfctl_show_nat(int dev, const char *path, int opts, char *anchorname, int depth, fprintf(stderr, "NAT anchor '%s' " "not found.\n", anchorname); else - errx(1, "%s", pfr_strerror(ret)); + errx(1, "%s", pf_strerror(ret)); } for (nr = 0; nr < mnr; ++nr) { if ((ret = pfctl_get_ruleset(pfh, npath, nr, &prs)) != 0) - errx(1, "%s", pfr_strerror(ret)); + errx(1, "%s", pf_strerror(ret)); INDENT(depth, !(opts & PF_OPT_VERBOSE)); printf("nat-anchor \"%s\" all {\n", prs.name); pfctl_show_nat(dev, npath, opts, @@ -3645,7 +3645,7 @@ main(int argc, char *argv[]) } char * -pfr_strerror(int errnum) +pf_strerror(int errnum) { switch (errnum) { case ESRCH: diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index 5b5b3d3e5fff..afecc78086e0 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -83,7 +83,7 @@ void *pfr_buf_next(struct pfr_buffer *, const void *); int pfr_buf_grow(struct pfr_buffer *, int); int pfr_buf_load(struct pfr_buffer *, char *, int, int (*)(struct pfr_buffer *, char *, int, int), int); -char *pfr_strerror(int); +char *pf_strerror(int); int pfi_get_ifaces(const char *, struct pfi_kif *, int *); int pfi_clr_istats(const char *, int *, int); diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index 24b774bc66be..d65503a3efb3 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -909,7 +909,7 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) TAILQ_INIT(&prof_superblocks); if ((ret = pfctl_get_rules_info_h(pf->h, &rules, PF_PASS, "")) != 0) { - warnx("%s", pfr_strerror(ret)); + warnx("%s", pf_strerror(ret)); return (1); } mnr = rules.nr; @@ -924,7 +924,7 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) if (pfctl_get_rule_h(pf->h, nr, rules.ticket, "", PF_PASS, &rule, anchor_call)) { - warnx("%s", pfr_strerror(ret)); + warnx("%s", pf_strerror(ret)); free(por); return (1); } diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 8033d3515572..f583f5ef8e79 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -79,7 +79,7 @@ static const char *istats_text[2][2][2] = { (opts & PF_OPT_DUMMYACTION)) && \ (fct)) { \ if ((opts & PF_OPT_RECURSE) == 0) \ - warnx("%s", pfr_strerror(errno)); \ + warnx("%s", pf_strerror(errno)); \ goto _error; \ } \ } while (0) @@ -92,7 +92,7 @@ static const char *istats_text[2][2][2] = { (opts & PF_OPT_DUMMYACTION)) && \ (pfr_add_table(&table, &nadd, flags)) && \ (errno != EPERM)) { \ - warnx("%s", pfr_strerror(errno)); \ + warnx("%s", pf_strerror(errno)); \ goto _error; \ } \ if (nadd) { \ @@ -640,7 +640,7 @@ pfctl_show_ifaces(const char *filter, int opts) pfr_buf_grow(&b, b.pfrb_size); b.pfrb_size = b.pfrb_msize; if (pfi_get_ifaces(filter, b.pfrb_caddr, &b.pfrb_size)) - errx(1, "%s", pfr_strerror(errno)); + errx(1, "%s", pf_strerror(errno)); if (b.pfrb_size <= b.pfrb_msize) break; }