git: 651fbbc9a69b - main - pf: Rename pf_anchor_remove() to pf_remove_anchor()

[Kristof Provost]

The branch main has been updated by kp:

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

commit 651fbbc9a69bddaa8abe1cd4434e70f1367396c9
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-06-30 17:06:06 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2025-07-04 08:31:12 +0000

    pf: Rename pf_anchor_remove() to pf_remove_anchor()
    
    For semantic consistency with pf_{create,find,remove}_{anchor,ruleset}().
    
    Simplify logic by squashing the if/else block while here.
    No functional change.
    
    Feedback jca and mikeb, OK mikeb
    
    Obtained from:  OpenBSD, kn <k...@openbsd.org>, f6275afa61
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/net/pfvar.h             | 2 +-
 sys/netpfil/pf/pf_ioctl.c   | 2 +-
 sys/netpfil/pf/pf_ruleset.c | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 028297310d7b..1416f0c2cdbe 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -2633,7 +2633,7 @@ int                        pf_kanchor_copyout(const 
struct pf_kruleset *,
                            const struct pf_krule *, char *, size_t);
 int                     pf_kanchor_nvcopyout(const struct pf_kruleset *,
                            const struct pf_krule *, nvlist_t *);
-void                    pf_kanchor_remove(struct pf_krule *);
+void                    pf_remove_kanchor(struct pf_krule *);
 void                    pf_remove_if_empty_kruleset(struct pf_kruleset *);
 struct pf_kruleset     *pf_find_kruleset(const char *);
 struct pf_kruleset     *pf_get_leaf_kruleset(char *, char **);
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 96e913635cd0..45201f2eaec9 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -615,7 +615,7 @@ pf_free_rule(struct pf_krule *rule)
                pfi_kkif_unref(rule->kif);
        if (rule->rcv_kif)
                pfi_kkif_unref(rule->rcv_kif);
-       pf_kanchor_remove(rule);
+       pf_remove_kanchor(rule);
        pf_empty_kpool(&rule->rdr.list);
        pf_empty_kpool(&rule->nat.list);
        pf_empty_kpool(&rule->route.list);
diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c
index 0414e4f06f9c..94e8527f6555 100644
--- a/sys/netpfil/pf/pf_ruleset.c
+++ b/sys/netpfil/pf/pf_ruleset.c
@@ -525,16 +525,13 @@ done:
 }
 
 void
-pf_kanchor_remove(struct pf_krule *r)
+pf_remove_kanchor(struct pf_krule *r)
 {
        if (r->anchor == NULL)
                return;
-       if (r->anchor->refcnt <= 0) {
+       if (r->anchor->refcnt <= 0)
                printf("%s: broken refcount\n", __func__);
-               r->anchor = NULL;
-               return;
-       }
-       if (!--r->anchor->refcnt)
+       else if (!--r->anchor->refcnt)
                pf_remove_if_empty_kruleset(&r->anchor->ruleset);
        r->anchor = NULL;
 }