zebra: Use __func__ instead of __PRETTY_FUNCTION__

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 55f8edd2729b3e675d02a4e44643b9c8ccd009f4..544bb07fbef42fc93e94e3bf8629ff32db99a82c 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -985,8 +985,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
        union sockunion ip;
 
        if (IS_ZEBRA_DEBUG_PACKET)
-               zlog_debug("%s: Notifying Neighbor entry (%u)",
-                          __PRETTY_FUNCTION__, cmd);
+               zlog_debug("%s: Notifying Neighbor entry (%u)", __func__, cmd);
 
        sockunion_family(&ip) = ipaddr_family(ipaddr);
        afi = family2afi(sockunion_family(&ip));
@@ -2509,7 +2508,7 @@ static void zread_sr_policy_set(ZAPI_HANDLER_ARGS)
        if (zapi_sr_policy_decode(s, &zp) < 0) {
                if (IS_ZEBRA_DEBUG_RECV)
                        zlog_debug("%s: Unable to decode zapi_sr_policy sent",
-                                  __PRETTY_FUNCTION__);
+                                  __func__);
                return;
        }
        zt = &zp.segment_list;
@@ -2517,7 +2516,7 @@ static void zread_sr_policy_set(ZAPI_HANDLER_ARGS)
                if (IS_ZEBRA_DEBUG_RECV)
                        zlog_debug(
                                "%s: SR-TE tunnel must contain at least one label",
-                               __PRETTY_FUNCTION__);
+                               __func__);
                return;
        }
 
@@ -2544,7 +2543,7 @@ static void zread_sr_policy_delete(ZAPI_HANDLER_ARGS)
        if (zapi_sr_policy_decode(s, &zp) < 0) {
                if (IS_ZEBRA_DEBUG_RECV)
                        zlog_debug("%s: Unable to decode zapi_sr_policy sent",
-                                  __PRETTY_FUNCTION__);
+                                  __func__);
                return;
        }
 
@@ -2554,8 +2553,7 @@ static void zread_sr_policy_delete(ZAPI_HANDLER_ARGS)
        policy = zebra_sr_policy_find(zp.color, &zp.endpoint);
        if (!policy) {
                if (IS_ZEBRA_DEBUG_RECV)
-                       zlog_debug("%s: Unable to find SR-TE policy",
-                                  __PRETTY_FUNCTION__);
+                       zlog_debug("%s: Unable to find SR-TE policy", __func__);
                return;
        }
 

diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index 0038689e857f69b9157e47d55a3305e751017675..d6ae92a03d2bedab0dd67209174e48870d4f72fc 100644 (file)
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -2476,8 +2476,8 @@ void zebra_evpn_proc_remote_es(ZAPI_HANDLER_ARGS)
 
        if (!is_evpn_enabled()) {
                zlog_debug(
-                               "%s: EVPN not enabled yet we received a es_add zapi call",
-                               __PRETTY_FUNCTION__);
+                       "%s: EVPN not enabled yet we received a es_add zapi call",
+                       __func__);
                return;
        }
 

diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c
index c4004842e6c9c33099437dd165ac49f5723f0b83..73c2c3dda3a04bc3a5cbc05ba84f661699a6c78c 100644 (file)
--- a/zebra/zebra_pbr.c
+++ b/zebra/zebra_pbr.c
@@ -512,7 +512,7 @@ void zebra_pbr_add_rule(struct zebra_pbr_rule *rule)
                if (pbr_rule_release(found))
                        zlog_debug(
                                "%s: Rule being updated we know nothing about",
-                               __PRETTY_FUNCTION__);
+                               __func__);
 
        } else {
                if (IS_ZEBRA_DEBUG_PBR)