diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2020-03-05 23:37:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 23:37:03 +0100 |
| commit | 498897d8d837f2abee51a0064ee45c639340c5bb (patch) | |
| tree | 45010659cdd6fc20103db249e24b9501c8f11e29 /nhrpd | |
| parent | Merge pull request #5856 from pguibert6WIND/nhrp_override_fix (diff) | |
| parent | *: Replace __PRETTY_FUNCTION__/__FUNCTION__ to __func__ (diff) | |
| download | frr-498897d8d837f2abee51a0064ee45c639340c5bb.tar.xz frr-498897d8d837f2abee51a0064ee45c639340c5bb.zip | |
Merge pull request #5918 from ton31337/fix/__func__everywhere
__func__ everywhere
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/nhrp_event.c | 2 | ||||
| -rw-r--r-- | nhrpd/vici.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c index 9301c2d51..40efeb579 100644 --- a/nhrpd/nhrp_event.c +++ b/nhrpd/nhrp_event.c @@ -200,7 +200,7 @@ static int evmgr_reconnect(struct thread *t) fd = sock_open_unix(nhrp_event_socket_path); if (fd < 0) { zlog_warn("%s: failure connecting nhrp-event socket: %s", - __PRETTY_FUNCTION__, strerror(errno)); + __func__, strerror(errno)); zbufq_reset(&evmgr->obuf); thread_add_timer(master, evmgr_reconnect, evmgr, 10, &evmgr->t_reconnect); diff --git a/nhrpd/vici.c b/nhrpd/vici.c index d6105b71d..4f12d796a 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -481,8 +481,8 @@ static int vici_reconnect(struct thread *t) fd = sock_open_unix("/var/run/charon.vici"); if (fd < 0) { debugf(NHRP_DEBUG_VICI, - "%s: failure connecting VICI socket: %s", - __PRETTY_FUNCTION__, strerror(errno)); + "%s: failure connecting VICI socket: %s", __func__, + strerror(errno)); thread_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect); return 0; |