There is no reason to add the __func__ in this warning.
It is just clutter in the error message with no benefit.
OK to remove?
--
:wq Claudio
Index: pfkey.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/pfkey.c,v
retrieving revision 1.64
diff -u -p -r1.64 pfkey.c
--- pfkey.c 15 Jun 2022 16:00:37 -0000 1.64
+++ pfkey.c 16 Jun 2022 09:32:20 -0000
@@ -567,7 +567,7 @@ pfkey_md5sig_establish(struct peer *p)
return (0);
fail:
- log_peer_warn(&p->conf, "%s: failed to insert md5sig", __func__);
+ log_peer_warn(&p->conf, "failed to insert md5sig");
return (-1);
}
@@ -589,7 +589,7 @@ pfkey_md5sig_remove(struct peer *p)
return (0);
fail:
- log_peer_warn(&p->conf, "%s: failed to remove md5sig", __func__);
+ log_peer_warn(&p->conf, "failed to remove md5sig");
return (-1);
}
@@ -704,10 +704,10 @@ pfkey_ipsec_establish(struct peer *p)
return (0);
fail_key:
- log_peer_warn(&p->conf, "%s: failed to insert ipsec key", __func__);
+ log_peer_warn(&p->conf, "failed to insert ipsec key");
return (-1);
fail_flow:
- log_peer_warn(&p->conf, "%s: failed to insert flow", __func__);
+ log_peer_warn(&p->conf, "failed to insert ipsec flow");
return (-1);
}
@@ -777,10 +777,10 @@ pfkey_ipsec_remove(struct peer *p)
return (0);
fail_key:
- log_peer_warn(&p->conf, "%s: failed to remove ipsec key", __func__);
+ log_peer_warn(&p->conf, "failed to remove ipsec key");
return (-1);
fail_flow:
- log_peer_warn(&p->conf, "%s: failed to remove flow", __func__);
+ log_peer_warn(&p->conf, "failed to remove ipsec flow");
return (-1);
}