From nobody Fri Jul 04 09:22:37 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 4bYSpQ2dT4z61GX8; Fri, 04 Jul 2025 09:22:38 +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 4bYSpQ0v5Nz3pnt; Fri, 04 Jul 2025 09:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620958; 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=GtXlrJXuelmwZjpXbrQhlQzuEL7uitvyhdXQkty9DAQ=; b=O7ElY72WqC2wJ1FJeR9qcdXcfWETeV7e3YeELYNFjd/SqsJYm79BQUxRJk2LiMNRV2MB9X rXkfUJ4jwtAA5fCMPP4bK2cbXOKB7rZVOANdo1SK++tsfEC0fKZ6P4XJUXC5XeE6AGVH1H rwKNq2VuvPDcXt1EyeGeHGNusYCVax2DuIzyVemMUY8VHeDKMQunw6JDvyUc4VdRKtQi2Y Sz/oIAEJISdfkCe6b9d93L11kDqiT3jc726nYOZ/Sy9PEHvMiEtEc3vIYeIRFm1n4oUBae UnEnctNDKTEXXR7PemQgqp97mMTw6Rwymp9uDLNpJbEZdWGUAoNRs/cEOn1HYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620958; 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=GtXlrJXuelmwZjpXbrQhlQzuEL7uitvyhdXQkty9DAQ=; b=mtQXo55HiZhww51k1aDTn7Qn9Xnk/fQR1sf1IMq6DtyMGTEUKMD59s1eujslm27tozP7AB HHdBkmAH9AQjOVjDJIUC0/IJnFZfHG5C1DRJkk97X1e4ZRHrfEMzWLRgvaXOJTC/hhAqsp shwIxzWO9PcWekDjuYnDXJEK/MXbZ+JvwPq/idehvq7QxasIcZKJmXNZEJydkngd+UzJxx Dthnoy5YC2CP/sCMNLt6M7xeK2qBAU5Itl8F4A5ggMNk/ZQxMnHl4cXRXqlHNmIVDzTreY 9AkLj4vOabnbZPRXeictFz01SAKkOKJN8nvamSbP5vgorsjXuHKuxsw8i7YBcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751620958; a=rsa-sha256; cv=none; b=S/yI5JvoYkOM9yCkflS7ZV7TQ1xI9DWlxXo4w7tB2+6pmzB3rg4muBNv35zxsnuaY97xjL ezKmLAbxKTtI3o7xTpjgXZKqVrhKX5Bcd5xKcRCVMzZ/OIkSjNr8GQaaZc2FH6pNIXR6I1 L6KKxna7McD+IMAN1QXm1VlFohbSxRivxyv5XZvEvCwzyzByeUVjzy1p961uAtRaRWNv5U 7Ml7XH42LSnbsB0EyxxWyA3RPxf5tNIqqw9EiiauHzACn5m8r3D7qvJsXP8vLtuFVbopv4 OjAUqrQY0lrDF+JqELmyA8BtdIK/PUfRvsy9LxBwicM5E9tGC21XbTV/Pcru9g== 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 4bYSpQ0PJyzlS2; Fri, 04 Jul 2025 09:22:38 +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 5649Mbir055748; Fri, 4 Jul 2025 09:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5649Mbkx055745; Fri, 4 Jul 2025 09:22:37 GMT (envelope-from git) Date: Fri, 4 Jul 2025 09:22:37 GMT Message-Id: <202507040922.5649Mbkx055745@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: 9ec47b79c10e - main - pf: replace hardcoded function names by __func__ 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: 9ec47b79c10e149a47bb8533eeadeebb85a3110c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec47b79c10e149a47bb8533eeadeebb85a3110c commit 9ec47b79c10e149a47bb8533eeadeebb85a3110c Author: Kristof Provost AuthorDate: 2025-06-30 16:34:09 +0000 Commit: Kristof Provost CommitDate: 2025-07-04 08:31:11 +0000 pf: replace hardcoded function names by __func__ Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ruleset.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c index 865c5ecd72d9..33527645e6e7 100644 --- a/sys/netpfil/pf/pf_ruleset.c +++ b/sys/netpfil/pf/pf_ruleset.c @@ -259,8 +259,8 @@ pf_create_kanchor(struct pf_kanchor *parent, const char *aname) if ((dup = RB_INSERT(pf_kanchor_global, &V_pf_anchors, anchor)) != NULL) { - printf("pf_find_or_create_ruleset: RB_INSERT1 " - "'%s' '%s' collides with '%s' '%s'\n", + printf("%s: RB_INSERT1 " + "'%s' '%s' collides with '%s' '%s'\n", __func__, anchor->path, anchor->name, dup->path, dup->name); rs_free(anchor); return (NULL); @@ -270,10 +270,10 @@ pf_create_kanchor(struct pf_kanchor *parent, const char *aname) anchor->parent = parent; if ((dup = RB_INSERT(pf_kanchor_node, &parent->children, anchor)) != NULL) { - printf("pf_find_or_create_ruleset: " + printf("%s: " "RB_INSERT2 '%s' '%s' collides with " - "'%s' '%s'\n", anchor->path, anchor->name, - dup->path, dup->name); + "'%s' '%s'\n", __func__, anchor->path, + anchor->name, dup->path, dup->name); RB_REMOVE(pf_kanchor_global, &V_pf_anchors, anchor); rs_free(anchor); @@ -444,7 +444,7 @@ pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, anchor_call_len); } if (strncmp(a, r->anchor->path, strlen(a))) { - printf("pf_anchor_copyout: '%s' '%s'\n", a, + printf("%s: '%s' '%s'\n", __func__, a, r->anchor->path); return (1); } @@ -530,7 +530,7 @@ pf_kanchor_remove(struct pf_krule *r) if (r->anchor == NULL) return; if (r->anchor->refcnt <= 0) { - printf("pf_anchor_remove: broken refcount\n"); + printf("%s: broken refcount\n", __func__); r->anchor = NULL; return; }