From cf3f15ba97d48e042b9186e11db4f998a7f866c2 Mon Sep 17 00:00:00 2001 From: claudio Date: Thu, 16 Jun 2022 09:51:07 +0000 Subject: [PATCH] Remove __func__ from warning messages where it does not add anything to the warning. The messages are clear enough and unique. OK tb@ --- usr.sbin/bgpd/pfkey.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bgpd/pfkey.c b/usr.sbin/bgpd/pfkey.c index fafef64b98f..21e509833c0 100644 --- a/usr.sbin/bgpd/pfkey.c +++ b/usr.sbin/bgpd/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.64 2022/06/15 16:00:37 claudio Exp $ */ +/* $OpenBSD: pfkey.c,v 1.65 2022/06/16 09:51:07 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -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); } -- 2.20.1