From nobody Sat Jul 12 13:38:46 2025 X-Original-To: dev-commits-src-all@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 4bfV6H4pttz61srC; Sat, 12 Jul 2025 13:38:47 +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 4bfV6H11s1z3Cbk; Sat, 12 Jul 2025 13:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327527; 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=jKfDbdE1hV8bQ6uZf9GqYEu7csfc5Ih2+SPPeOoupEU=; b=QcW34zjQdNB36nlyjy9u/B8lQnW1saitEkq9N12PGyXnm2rXTpl1n17jkBx0vMsAJt6KZ2 wVMvER5GFVQSS9AAeEfpe+t6hbwdqYcLHKZ1icnhQC/jalvNx+0xT05duCosyoupkgYNuC 2Q+DXelDGf9xmK8Va3XWNzuZx1t34p5SPR4QLRXMRQykZC7x2UZUPr30IB2yGbT09dgofz vc+CrFqInhSX9pH572XoIH4PEetZGkww1kf5/z8i4EoWxGnLZrnZBaKQX4q7SupbfEF6uW YDWvzwNzQs96n2ujNUBNv8xBfBPcZeQAsz3ln0MVd/ZpcABdsyL6leuQexmZOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327527; 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=jKfDbdE1hV8bQ6uZf9GqYEu7csfc5Ih2+SPPeOoupEU=; b=eCk0iU4wnUdmxhjUCcueCBZHMQKJBpUxpu4HfJdAQf//HzaQDt5K59dbSGShCueWgkkTUK CEjNw1i3w2zNc9twHj0zdLFp7vMyPyQ+yiCjq/foUMebqTsPWyOTtuEldDoQm6bEpZHLBy ER2Szq86TW39VeEGvhMGrxavpkd1/ArNc9Y5KRioCwoN/3wZXbUpMTEiYmtPM3QVfSRWbS 7yfUBqOWohsZvJDyxItl9/mdLgXZkUOK4YXqjXCZpbxKJg+pXk3cvyOjIsEzXJ4fyFXJM8 44klDZN1uWutHeGWw9aRTC3wzcCTZRsgUdfI3Y4FlZ3O3FoPSHXldIQ4XQ1yIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327527; a=rsa-sha256; cv=none; b=mqwp+msqm1U6IQrkfhN0DjHCtb50qKtDI3ue0lELm15GuEOCmKB5DPH4K7GZyAtLReEkfJ DHXd2iWxadztF+mNJBPmb9CiF4w4axo99ScAaMrDj+PzcQMZQEi7NdloqaVZESiFHLOMu3 KvXul6iYokbdB3oS4o80BCgHSbh057ktRb3KozYV5QELcHHnqjQEJ4obTmcyhdomKDd6M1 OqFG0XsPAIy+aBa09n36UJQJbf1ME4kEW5BtsIKSDyUfAShJIKJ0MB/9Nw44LDUHmdZOI/ ehRRiKkv0nN6MIwWErvlGMTsewRE5F4WDBVc7YW8eoYMAsXH7rT9MtXzoq9fAA== 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 4bfV6H023Fz95r; Sat, 12 Jul 2025 13:38:47 +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 56CDckbd088781; Sat, 12 Jul 2025 13:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDckZF088778; Sat, 12 Jul 2025 13:38:46 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:46 GMT Message-Id: <202507121338.56CDckZF088778@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: b2c8af25d5e0 - main - pfctl: Merge radix_perror() into simpler warnx()/errx() usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b2c8af25d5e0e5ff5ee25c4788afa5b2c836af8d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c8af25d5e0e5ff5ee25c4788afa5b2c836af8d commit b2c8af25d5e0e5ff5ee25c4788afa5b2c836af8d Author: Kristof Provost AuthorDate: 2025-07-07 06:28:39 +0000 Commit: Kristof Provost 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 , 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; }