summaryrefslogtreecommitdiffstats
path: root/pimd/pim_neighbor.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2020-03-06 15:23:22 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2020-03-06 15:23:22 +0100
commit5e81f5dd1a2dd82ee6aa08f4a9375e4cd83407a0 (patch)
tree1f1d7fa1e9f47f3b7b3d312ed94685b84c781081 /pimd/pim_neighbor.c
parentMerge pull request #5920 from qlyoung/fix-srv6-repeated-attr-memleak (diff)
downloadfrr-5e81f5dd1a2dd82ee6aa08f4a9375e4cd83407a0.tar.xz
frr-5e81f5dd1a2dd82ee6aa08f4a9375e4cd83407a0.zip
*: Finish off the __PRETTY_FUNCTION__ to __func__
FINISH IT Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_neighbor.c')
-rw-r--r--pimd/pim_neighbor.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index ec40beec7..ca7ca1140 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -53,8 +53,7 @@ static void dr_election_by_addr(struct interface *ifp)
pim_ifp->pim_dr_addr = pim_ifp->primary_address;
if (PIM_DEBUG_PIM_TRACE) {
- zlog_debug("%s: on interface %s", __PRETTY_FUNCTION__,
- ifp->name);
+ zlog_debug("%s: on interface %s", __func__, ifp->name);
}
for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, node, neigh)) {
@@ -79,14 +78,14 @@ static void dr_election_by_pri(struct interface *ifp)
dr_pri = pim_ifp->pim_dr_priority;
if (PIM_DEBUG_PIM_TRACE) {
- zlog_debug("%s: dr pri %u on interface %s", __PRETTY_FUNCTION__,
- dr_pri, ifp->name);
+ zlog_debug("%s: dr pri %u on interface %s", __func__, dr_pri,
+ ifp->name);
}
for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, node, neigh)) {
if (PIM_DEBUG_PIM_TRACE) {
zlog_info("%s: neigh pri %u addr %x if dr addr %x",
- __PRETTY_FUNCTION__, neigh->dr_priority,
+ __func__, neigh->dr_priority,
ntohl(neigh->source_addr.s_addr),
ntohl(pim_ifp->pim_dr_addr.s_addr));
}
@@ -389,7 +388,7 @@ static void delete_prefix_list(struct pim_neighbor *neigh)
sizeof(addr_str));
zlog_debug(
"%s: DUMP_PREFIX_LIST neigh=%x prefix_list=%x prefix=%x addr=%s [%d/%d]",
- __PRETTY_FUNCTION__, (unsigned)neigh,
+ __func__, (unsigned)neigh,
(unsigned)neigh->prefix_list, (unsigned)p,
addr_str, i, list_size);
++i;