*: Replace __PRETTY_FUNCTION__/__FUNCTION__ to __func__

Just keep the code cool.

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

1 files changed, 17 insertions, 24 deletions

diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index b21ff56ce1..93e2f00f90 100644
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -239,8 +239,7 @@ static void pim_vxlan_orig_mr_up_del(struct pim_vxlan_sg *vxlan_sg)
 			 * origination mroutes active sources but just in
 			 * case
 			 */
-			up = pim_upstream_del(vxlan_sg->pim, up,
-				__PRETTY_FUNCTION__);
+			up = pim_upstream_del(vxlan_sg->pim, up, __func__);
 		}
 		/* if there are other references register the source
 		 * for nht
@@ -344,7 +343,7 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
 		}
 		/* We are acting FHR; clear out use_rpt setting if any */
 		pim_upstream_update_use_rpt(up, false /*update_mroute*/);
-		pim_upstream_ref(up, flags, __PRETTY_FUNCTION__);
+		pim_upstream_ref(up, flags, __func__);
 		vxlan_sg->up = up;
 		pim_vxlan_orig_mr_up_iif_update(vxlan_sg);
 		/* mute pimreg on origination mroutes */
@@ -353,8 +352,7 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
 					pim->regiface->info);
 	} else {
 		up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg,
-				vxlan_sg->iif, flags,
-				__PRETTY_FUNCTION__, NULL);
+				      vxlan_sg->iif, flags, __func__, NULL);
 		vxlan_sg->up = up;
 	}
 
@@ -614,9 +612,8 @@ static void pim_vxlan_term_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
 	/* enable MLAG designated-forwarder election on termination mroutes */
 	PIM_UPSTREAM_FLAG_SET_MLAG_VXLAN(flags);
 
-	up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg,
-			NULL /* iif */, flags,
-			__PRETTY_FUNCTION__, NULL);
+	up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg, NULL /* iif */,
+			      flags, __func__, NULL);
 	vxlan_sg->up = up;
 
 	if (!up) {
@@ -648,8 +645,7 @@ static void pim_vxlan_term_mr_up_del(struct pim_vxlan_sg *vxlan_sg)
 		up->flags &= ~(PIM_UPSTREAM_FLAG_MASK_SRC_VXLAN_TERM |
 			PIM_UPSTREAM_FLAG_MASK_MLAG_VXLAN);
 		pim_mlag_up_local_del(vxlan_sg->pim, up);
-		pim_upstream_del(vxlan_sg->pim, up,
-				__PRETTY_FUNCTION__);
+		pim_upstream_del(vxlan_sg->pim, up, __func__);
 	}
 }
 
@@ -881,9 +877,8 @@ static void pim_vxlan_set_default_iif(struct pim_instance *pim,
 	old_iif = pim->vxlan.default_iif;
 	if (PIM_DEBUG_VXLAN)
 		zlog_debug("%s: vxlan default iif changed from %s to %s",
-			__PRETTY_FUNCTION__,
-			old_iif ? old_iif->name : "-",
-			ifp ? ifp->name : "-");
+			   __func__, old_iif ? old_iif->name : "-",
+			   ifp ? ifp->name : "-");
 
 	old_iif = pim_vxlan_orig_mr_iif_get(pim);
 	pim->vxlan.default_iif = ifp;
@@ -892,9 +887,9 @@ static void pim_vxlan_set_default_iif(struct pim_instance *pim,
 		return;
 
 	if (PIM_DEBUG_VXLAN)
-		zlog_debug("%s: vxlan orig iif changed from %s to %s",
-			__PRETTY_FUNCTION__, old_iif ? old_iif->name : "-",
-			ifp ? ifp->name : "-");
+		zlog_debug("%s: vxlan orig iif changed from %s to %s", __func__,
+			   old_iif ? old_iif->name : "-",
+			   ifp ? ifp->name : "-");
 
 	/* add/del upstream entries for the existing vxlan SG when the
 	 * interface becomes available
@@ -973,8 +968,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
 	old_iif = pim->vxlan.peerlink_rif;
 	if (PIM_DEBUG_VXLAN)
 		zlog_debug("%s: vxlan peerlink_rif changed from %s to %s",
-			__PRETTY_FUNCTION__, old_iif ? old_iif->name : "-",
-			ifp ? ifp->name : "-");
+			   __func__, old_iif ? old_iif->name : "-",
+			   ifp ? ifp->name : "-");
 
 	old_iif = pim_vxlan_orig_mr_iif_get(pim);
 	old_oif = pim_vxlan_orig_mr_oif_get(pim);
@@ -984,9 +979,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
 	if (old_iif != new_iif) {
 		if (PIM_DEBUG_VXLAN)
 			zlog_debug("%s: vxlan orig iif changed from %s to %s",
-				__PRETTY_FUNCTION__,
-				old_iif ? old_iif->name : "-",
-				new_iif ? new_iif->name : "-");
+				   __func__, old_iif ? old_iif->name : "-",
+				   new_iif ? new_iif->name : "-");
 
 		/* add/del upstream entries for the existing vxlan SG when the
 		 * interface becomes available
@@ -1001,9 +995,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
 	if (old_oif != new_oif) {
 		if (PIM_DEBUG_VXLAN)
 			zlog_debug("%s: vxlan orig oif changed from %s to %s",
-				__PRETTY_FUNCTION__,
-				old_oif ? old_oif->name : "-",
-				new_oif ? new_oif->name : "-");
+				   __func__, old_oif ? old_oif->name : "-",
+				   new_oif ? new_oif->name : "-");
 		if (pim->vxlan.sg_hash)
 			hash_iterate(pim->vxlan.sg_hash,
 					pim_vxlan_sg_peerlink_oif_update,