*: Replace __PRETTY_FUNCTION__/__FUNCTION__ to __func__

Just keep the code cool.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

1 files changed, 18 insertions, 18 deletions

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 2db39bac4b..55b7db6a5c 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -351,8 +351,7 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
 
 	if (PIM_DEBUG_PIM_TRACE)
 		zlog_debug("%s: pim upstream update for  old upstream %s",
-			   __PRETTY_FUNCTION__,
-			   inet_ntoa(old_upstream_addr));
+			   __func__, inet_ntoa(old_upstream_addr));
 
 	if (old_upstream_addr.s_addr == new_upstream_addr.s_addr)
 		return;
@@ -371,8 +370,9 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
 			char buf[PREFIX2STR_BUFFER];
 
 			prefix2str(&nht_p, buf, sizeof(buf));
-			zlog_debug("%s: Deregister upstream %s addr %s with Zebra NHT",
-				   __PRETTY_FUNCTION__, up->sg_str, buf);
+			zlog_debug(
+				"%s: Deregister upstream %s addr %s with Zebra NHT",
+				__func__, up->sg_str, buf);
 		}
 		pim_delete_tracked_nexthop(pim, &nht_p, up, NULL, false);
 	}
@@ -384,7 +384,7 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
 
 	rpf_result = pim_rpf_update(pim, up, &old_rpf, __func__);
 	if (rpf_result == PIM_RPF_FAILURE)
-		pim_mroute_del(up->channel_oil, __PRETTY_FUNCTION__);
+		pim_mroute_del(up->channel_oil, __func__);
 
 	/* update kernel multicast forwarding cache (MFC) */
 	if (up->rpf.source_nexthop.interface && up->channel_oil)
@@ -744,8 +744,8 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
 	}
 
 	if (PIM_DEBUG_PIM_TRACE)
-		zlog_debug("%s: Delete RP %s for the group %s",
-			   __PRETTY_FUNCTION__, rp_str, grp_str);
+		zlog_debug("%s: Delete RP %s for the group %s", __func__,
+			   rp_str, grp_str);
 
 	/* While static RP is getting deleted, we need to check if dynamic RP
 	 * present for the same group in BSM RP table, then install the dynamic
@@ -764,9 +764,9 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
 						       sizeof(bsrp_str)))
 						sprintf(bsrp_str, "<bsrp?>");
 
-					zlog_debug("%s: BSM RP %s found for the group %s",
-						   __PRETTY_FUNCTION__,
-						   bsrp_str, grp_str);
+					zlog_debug(
+						"%s: BSM RP %s found for the group %s",
+						__func__, bsrp_str, grp_str);
 				}
 				return pim_rp_change(pim, bsrp->rp_address,
 						     group, RP_SRC_BSR);
@@ -775,7 +775,7 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
 			if (PIM_DEBUG_PIM_TRACE)
 				zlog_debug(
 					"%s: BSM RP not found for the group %s",
-					__PRETTY_FUNCTION__, grp_str);
+					__func__, grp_str);
 		}
 	}
 
@@ -786,8 +786,8 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
 	if (PIM_DEBUG_PIM_NHT_RP) {
 		char buf[PREFIX2STR_BUFFER];
 		prefix2str(&nht_p, buf, sizeof(buf));
-		zlog_debug("%s: Deregister RP addr %s with Zebra ",
-			   __PRETTY_FUNCTION__, buf);
+		zlog_debug("%s: Deregister RP addr %s with Zebra ", __func__,
+			   buf);
 	}
 	pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info, false);
 
@@ -836,7 +836,7 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
 
 				zlog_debug(
 					"%s:Found for Freeing: %p for rp_info: %p(%s) Lock: %d",
-					__PRETTY_FUNCTION__, rn, rp_info,
+					__func__, rn, rp_info,
 					prefix2str(&rp_info->group, buf,
 						   sizeof(buf)),
 					rn->lock);
@@ -924,7 +924,7 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
 
 			prefix2str(&nht_p, buf, sizeof(buf));
 			zlog_debug("%s: Deregister RP addr %s with Zebra ",
-				   __PRETTY_FUNCTION__, buf);
+				   __func__, buf);
 		}
 		pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info, false);
 	}
@@ -962,7 +962,7 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
 		prefix2str(&nht_p, buf, sizeof(buf));
 		prefix2str(&rp_info->group, buf1, sizeof(buf1));
 		zlog_debug("%s: NHT Register RP addr %s grp %s with Zebra ",
-			   __PRETTY_FUNCTION__, buf, buf1);
+			   __func__, buf, buf1);
 	}
 
 	pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, false, NULL);
@@ -1146,7 +1146,7 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group)
 			prefix2str(&rp_info->group, buf1, sizeof(buf1));
 			zlog_debug(
 				"%s: NHT Register RP addr %s grp %s with Zebra",
-				__PRETTY_FUNCTION__, buf, buf1);
+				__func__, buf, buf1);
 		}
 		pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, false,
 					  NULL);
@@ -1185,7 +1185,7 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, struct in_addr *up,
 			 && (source.s_addr == INADDR_ANY))) {
 		if (PIM_DEBUG_PIM_NHT_RP)
 			zlog_debug("%s: Received a (*,G) with no RP configured",
-				   __PRETTY_FUNCTION__);
+				   __func__);
 		up->s_addr = INADDR_ANY;
 		return 0;
 	}