git: b2c8af25d5e0 - main - pfctl: Merge radix_perror() into simpler warnx()/errx() usage

[Kristof Provost]

The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b2c8af25d5e0e5ff5ee25c4788afa5b2c836af8d

commit b2c8af25d5e0e5ff5ee25c4788afa5b2c836af8d
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-07-07 06:28:39 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2025-07-12 09:57:49 +0000

    pfctl: Merge radix_perror() into simpler warnx()/errx() usage
    
    Less nesting for clearer code.
    
    OK sashan
    
    Obtained from:  OpenBSD, kn <k...@openbsd.org>, e13f010528
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sbin/pfctl/pfctl_table.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c
index 0b52f88eafbb..8033d3515572 100644
--- a/sbin/pfctl/pfctl_table.c
+++ b/sbin/pfctl/pfctl_table.c
@@ -61,7 +61,6 @@ static int    load_addr(struct pfr_buffer *, int, char *[], 
char *, int, int);
 static void    print_addrx(struct pfr_addr *, struct pfr_addr *, int);
 static int     nonzero_astats(struct pfr_astats *);
 static void    print_astats(struct pfr_astats *, int);
-static void    radix_perror(void);
 static void    xprintf(int, const char *, ...);
 static void    print_iface(struct pfi_kif *, int);
 
@@ -75,14 +74,14 @@ static const char   *istats_text[2][2][2] = {
        { { "In6/Pass:", "In6/Block:" }, { "Out6/Pass:", "Out6/Block:" } }
 };
 
-#define RVTEST(fct) do {                               \
-               if ((!(opts & PF_OPT_NOACTION) ||       \
-                   (opts & PF_OPT_DUMMYACTION)) &&     \
-                   (fct)) {                            \
-               if ((opts & PF_OPT_RECURSE) == 0)       \
-                               radix_perror();         \
-                       goto _error;                    \
-               }                                       \
+#define RVTEST(fct) do {                                               \
+               if ((!(opts & PF_OPT_NOACTION) ||                       \
+                   (opts & PF_OPT_DUMMYACTION)) &&                     \
+                   (fct)) {                                            \
+                       if ((opts & PF_OPT_RECURSE) == 0)               \
+                               warnx("%s", pfr_strerror(errno));       \
+                       goto _error;                                    \
+               }                                                       \
        } while (0)
 
 #define CREATE_TABLE do {                                              \
@@ -93,7 +92,7 @@ static const char     *istats_text[2][2][2] = {
                    (opts & PF_OPT_DUMMYACTION)) &&                     \
                    (pfr_add_table(&table, &nadd, flags)) &&            \
                    (errno != EPERM)) {                                 \
-                       radix_perror();                                 \
+                       warnx("%s", pfr_strerror(errno));               \
                        goto _error;                                    \
                }                                                       \
                if (nadd) {                                             \
@@ -559,13 +558,6 @@ print_astats(struct pfr_astats *as, int dns)
                            (unsigned long long)as->pfras_bytes[dir][op]);
 }
 
-void
-radix_perror(void)
-{
-       extern char *__progname;
-       fprintf(stderr, "%s: %s.\n", __progname, pfr_strerror(errno));
-}
-
 int
 pfctl_define_table(char *name, int flags, int addrs, const char *anchor,
     struct pfr_buffer *ab, u_int32_t ticket)
@@ -647,10 +639,8 @@ pfctl_show_ifaces(const char *filter, int opts)
        for (;;) {
                pfr_buf_grow(&b, b.pfrb_size);
                b.pfrb_size = b.pfrb_msize;
-               if (pfi_get_ifaces(filter, b.pfrb_caddr, &b.pfrb_size)) {
-                       radix_perror();
-                       exit(1);
-               }
+               if (pfi_get_ifaces(filter, b.pfrb_caddr, &b.pfrb_size))
+                       errx(1, "%s", pfr_strerror(errno));
                if (b.pfrb_size <= b.pfrb_msize)
                        break;
        }