upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-12 10:10:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pfctl: Do the actual pfr_strerror() to pf_strerror() rename

Browse source 
Missed in previous

Obtained from:	OpenBSD, kn <kn@openbsd.org>, c802a0d9d6
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost 2025-07-07 09:07:31 +02:00
parent 7153a62d29
commit 004062345b
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sbin/pfctl/parse.y
View file

@ -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;
}

12
sbin/pfctl/pfctl.c
View file

@ -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:

2
sbin/pfctl/pfctl.h
View file

@ -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);

4
sbin/pfctl/pfctl_optimize.c
View file

@ -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);
}

6
sbin/pfctl/pfctl_table.c
View file

@ -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;
}