bgpd,zebra: replace some more FUNCTION macros

Replace some remaining __FUNCTION__ macros with __func__,
now that we're trying to converge that way.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index a7b2bc3458f66f26776cfc927e15b602e18a4f92..6c31ec1b98fc00a2d0292d425aa95ed28f88cfb6 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -2328,7 +2328,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_PKT_OPEN,
                                        "%s: BGP OPEN receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                case BGP_MSG_UPDATE:
                        atomic_fetch_add_explicit(&peer->update_in, 1,
@@ -2339,7 +2339,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_UPDATE_RCV,
                                        "%s: BGP UPDATE receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                case BGP_MSG_NOTIFY:
                        atomic_fetch_add_explicit(&peer->notify_in, 1,
@@ -2349,7 +2349,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_NOTIFY_RCV,
                                        "%s: BGP NOTIFY receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                case BGP_MSG_KEEPALIVE:
                        peer->readtime = monotime(NULL);
@@ -2360,7 +2360,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_KEEP_RCV,
                                        "%s: BGP KEEPALIVE receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                case BGP_MSG_ROUTE_REFRESH_NEW:
                case BGP_MSG_ROUTE_REFRESH_OLD:
@@ -2371,7 +2371,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_RFSH_RCV,
                                        "%s: BGP ROUTEREFRESH receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                case BGP_MSG_CAPABILITY:
                        atomic_fetch_add_explicit(&peer->dynamic_cap_in, 1,
@@ -2381,7 +2381,7 @@ int bgp_process_packet(struct thread *thread)
                                flog_err(
                                        EC_BGP_CAP_RCV,
                                        "%s: BGP CAPABILITY receipt failed for peer: %s",
-                                       __FUNCTION__, peer->host);
+                                       __func__, peer->host);
                        break;
                default:
                        /* Suppress uninitialized variable warning */

diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index d1148061b992f15fe543d1bc1190ef67fa0663f7..80cc18a57d06a8c35a83a2e5baba6862ad2ece8a 100644 (file)
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -173,8 +173,7 @@ void redistribute_update(const struct prefix *p, const struct prefix *src_p,
        afi = family2afi(p->family);
        if (!afi) {
                flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
-                         "%s: Unknown AFI/SAFI prefix received\n",
-                         __FUNCTION__);
+                         "%s: Unknown AFI/SAFI prefix received\n", __func__);
                return;
        }
        if (!zebra_check_addr(p)) {

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 6cfc68eb74721c4d54c69a6d1c197707bb67691f..c758e25839e321254ca51df0bc8d8adf91e0efa3 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -1030,7 +1030,7 @@ static int send_client(struct rnh *rnh, struct zserv *client, rnh_type_t type,
        default:
                flog_err(EC_ZEBRA_RNH_UNKNOWN_FAMILY,
                         "%s: Unknown family (%d) notification attempted\n",
-                        __FUNCTION__, rn->p.family);
+                        __func__, rn->p.family);
                break;
        }
        if (re) {