*: Finish off the __PRETTY_FUNCTION__ to __func__

FINISH IT

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

1 files changed, 51 insertions, 45 deletions

diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index b0d501dab4..ead186b6fc 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -763,11 +763,13 @@ void ospf6_abr_old_path_update(struct ospf6_route *old_route,
 		}
 
 		if (IS_OSPF6_DEBUG_ABR || IS_OSPF6_DEBUG_EXAMIN(INTER_PREFIX))
-			zlog_debug("%s: paths %u nh %u", __PRETTY_FUNCTION__,
-				   old_route->paths ?
-				   listcount(old_route->paths) : 0,
-				   old_route->nh_list ?
-				   listcount(old_route->nh_list) : 0);
+			zlog_debug("%s: paths %u nh %u", __func__,
+				   old_route->paths
+					   ? listcount(old_route->paths)
+					   : 0,
+				   old_route->nh_list
+					   ? listcount(old_route->nh_list)
+					   : 0);
 
 		if (table->hook_add)
 			(*table->hook_add)(old_route);
@@ -823,9 +825,10 @@ void ospf6_abr_old_route_remove(struct ospf6_lsa *lsa,
 					prefix2str(&old->prefix, buf,
 						   sizeof(buf));
 					zlog_debug("%s: old %s updated nh %u",
-						   __PRETTY_FUNCTION__, buf,
-						   old->nh_list ?
-						   listcount(old->nh_list) : 0);
+						   __func__, buf,
+						   old->nh_list ? listcount(
+							   old->nh_list)
+								: 0);
 				}
 
 				if (table->hook_add)
@@ -879,8 +882,8 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 	if (lsa->header->type == htons(OSPF6_LSTYPE_INTER_PREFIX)) {
 		if (IS_OSPF6_DEBUG_EXAMIN(INTER_PREFIX)) {
 			is_debug++;
-			zlog_debug("%s: Examin %s in area %s",
-				   __PRETTY_FUNCTION__, lsa->name, oa->name);
+			zlog_debug("%s: Examin %s in area %s", __func__,
+				   lsa->name, oa->name);
 		}
 
 		prefix_lsa =
@@ -899,8 +902,8 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 	} else if (lsa->header->type == htons(OSPF6_LSTYPE_INTER_ROUTER)) {
 		if (IS_OSPF6_DEBUG_EXAMIN(INTER_ROUTER)) {
 			is_debug++;
-			zlog_debug("%s: Examin %s in area %s",
-				   __PRETTY_FUNCTION__, lsa->name, oa->name);
+			zlog_debug("%s: Examin %s in area %s", __func__,
+				   lsa->name, oa->name);
 		}
 
 		router_lsa =
@@ -947,9 +950,10 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 						old = route;
 
 						if (is_debug)
-							zlog_debug("%s: old entry found in paths, adv_router %s",
-							__PRETTY_FUNCTION__,
-							adv_router);
+							zlog_debug(
+								"%s: old entry found in paths, adv_router %s",
+								__func__,
+								adv_router);
 
 						break;
 					}
@@ -974,8 +978,8 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 	}
 	if (OSPF6_LSA_IS_MAXAGE(lsa)) {
 		if (is_debug)
-			zlog_debug("%s: LSA %s is MaxAge, ignore",
-				   __PRETTY_FUNCTION__, lsa->name);
+			zlog_debug("%s: LSA %s is MaxAge, ignore", __func__,
+				   lsa->name);
 		if (old)
 			ospf6_abr_old_route_remove(lsa, old, table);
 		return;
@@ -1054,21 +1058,21 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 	    || CHECK_FLAG(abr_entry->flag, OSPF6_ROUTE_REMOVE)
 	    || !CHECK_FLAG(abr_entry->path.router_bits, OSPF6_ROUTER_BIT_B)) {
 		if (is_debug)
-			zlog_debug("%s: ABR router entry does not exist, ignore",
-				   __PRETTY_FUNCTION__);
+			zlog_debug(
+				"%s: ABR router entry does not exist, ignore",
+				__func__);
 		if (old) {
 			if (old->type == OSPF6_DEST_TYPE_ROUTER &&
 			    oa->intra_brouter_calc) {
 				if (is_debug)
 					zlog_debug(
-						   "%s: intra_brouter_calc is on, skip brouter remove: %s (%p)",
-						   __PRETTY_FUNCTION__, buf,
-						   (void *)old);
+						"%s: intra_brouter_calc is on, skip brouter remove: %s (%p)",
+						__func__, buf, (void *)old);
 			} else {
 				if (is_debug)
-					zlog_debug("%s: remove old entry: %s %p ",
-						   __PRETTY_FUNCTION__, buf,
-						   (void *)old);
+					zlog_debug(
+						"%s: remove old entry: %s %p ",
+						__func__, buf, (void *)old);
 				ospf6_route_remove(old, table);
 			}
 		}
@@ -1143,11 +1147,10 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 		if ((ospf6_route_cmp(route, old_route) != 0)) {
 			if (is_debug) {
 				prefix2str(&prefix, buf, sizeof(buf));
-				zlog_debug("%s: old %p %s cost %u new route cost %u are not same",
-					   __PRETTY_FUNCTION__,
-					   (void *)old_route, buf,
-					   old_route->path.cost,
-					   route->path.cost);
+				zlog_debug(
+					"%s: old %p %s cost %u new route cost %u are not same",
+					__func__, (void *)old_route, buf,
+					old_route->path.cost, route->path.cost);
 			}
 
 			/* Check new route's adv. router is same in one of
@@ -1186,14 +1189,15 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 				inet_ntop(AF_INET,
 					  &ecmp_path->origin.adv_router,
 					  adv_router, sizeof(adv_router));
-				zlog_debug("%s: route %s cost %u another path %s added with nh %u, effective paths %u nh %u",
-						__PRETTY_FUNCTION__, buf,
-						old_route->path.cost,
-						adv_router,
-						listcount(ecmp_path->nh_list),
-						old_route->paths ?
-						listcount(old_route->paths) : 0,
-						listcount(old_route->nh_list));
+				zlog_debug(
+					"%s: route %s cost %u another path %s added with nh %u, effective paths %u nh %u",
+					__func__, buf, old_route->path.cost,
+					adv_router,
+					listcount(ecmp_path->nh_list),
+					old_route->paths
+						? listcount(old_route->paths)
+						: 0,
+					listcount(old_route->nh_list));
 			}
 		} else {
 			/* adv. router exists in the list, update the nhs */
@@ -1202,10 +1206,11 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 		}
 
 		if (is_debug)
-			zlog_debug("%s: Update route: %s %p old cost %u new cost %u nh %u",
-				   __PRETTY_FUNCTION__, buf, (void *)old_route,
-				   old_route->path.cost, route->path.cost,
-				   listcount(route->nh_list));
+			zlog_debug(
+				"%s: Update route: %s %p old cost %u new cost %u nh %u",
+				__func__, buf, (void *)old_route,
+				old_route->path.cost, route->path.cost,
+				listcount(route->nh_list));
 
 		/* For Inter-Prefix route: Update RIB/FIB,
 		 * For Inter-Router trigger summary update
@@ -1222,9 +1227,10 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa)
 		if (is_debug) {
 			inet_ntop(AF_INET, &route->path.origin.adv_router,
 				  adv_router, sizeof(adv_router));
-			zlog_debug("%s: Install route: %s cost %u nh %u adv_router %s ",
-				   __PRETTY_FUNCTION__, buf, route->path.cost,
-				   listcount(route->nh_list), adv_router);
+			zlog_debug(
+				"%s: Install route: %s cost %u nh %u adv_router %s ",
+				__func__, buf, route->path.cost,
+				listcount(route->nh_list), adv_router);
 		}
 
 		path = ospf6_path_dup(&route->path);