From 41714081283a2ed4d69ba948f20772bfb65d44c8 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 28 Mar 2019 15:44:58 -0400 Subject: [PATCH] pimd: Cleanup extra paranthesis around S,G printout When we are displaying S,G string data we already auto display the string as (S,G) no need to have ((S,G)). Cleanup some that were found during log look through. Signed-off-by: Donald Sharp --- pimd/pim_ifchannel.c | 2 +- pimd/pim_mroute.c | 4 ++-- pimd/pim_register.c | 5 ++--- pimd/pim_upstream.c | 2 +- pimd/pim_zlookup.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 14ce8d7d9f..0fe4110f60 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -911,7 +911,7 @@ void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream, if (!ch && !(source_flags & PIM_ENCODE_RPT_BIT)) { if (PIM_DEBUG_TRACE) zlog_debug( - "%s: Received prune with no relevant ifchannel %s(%s) state: %d", + "%s: Received prune with no relevant ifchannel %s%s state: %d", __PRETTY_FUNCTION__, ifp->name, pim_str_sg_dump(sg), source_flags); return; diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 67b1a95f74..bba4031744 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -1030,7 +1030,7 @@ void pim_mroute_update_counters(struct channel_oil *c_oil) sg.grp = c_oil->oil.mfcc_mcastgrp; if (PIM_DEBUG_MROUTE) zlog_debug( - "Channel(%s) is not installed no need to collect data from kernel", + "Channel%s is not installed no need to collect data from kernel", pim_str_sg_dump(&sg)); } return; @@ -1049,7 +1049,7 @@ void pim_mroute_update_counters(struct channel_oil *c_oil) sg.grp = c_oil->oil.mfcc_mcastgrp; zlog_warn( - "ioctl(SIOCGETSGCNT=%lu) failure for (S,G)=(%s): errno=%d: %s", + "ioctl(SIOCGETSGCNT=%lu) failure for (S,G)=%s: errno=%d: %s", (unsigned long)SIOCGETSGCNT, pim_str_sg_dump(&sg), errno, safe_strerror(errno)); diff --git a/pimd/pim_register.c b/pimd/pim_register.c index a5b1c577e7..386ed1d424 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -329,9 +329,8 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr, char src_str[INET_ADDRSTRLEN]; pim_inet4_dump("", src_addr, src_str, sizeof(src_str)); - zlog_debug( - "Received Register message(%s) from %s on %s, rp: %d", - pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp); + zlog_debug("Received Register message%s from %s on %s, rp: %d", + pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp); } if (i_am_rp diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index cb89e30a50..2a0804e10b 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1682,7 +1682,7 @@ static void pim_upstream_sg_running(void *arg) // No packet can have arrived here if this is the case if (!up->channel_oil->installed) { if (PIM_DEBUG_TRACE) - zlog_debug("%s: %s[%s] is not installed in mroute", + zlog_debug("%s: %s%s is not installed in mroute", __PRETTY_FUNCTION__, up->sg_str, pim->vrf->name); return; diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 0ffe313c17..6d93a40b91 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -499,7 +499,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil) more.src = c_oil->oil.mfcc_origin; more.grp = c_oil->oil.mfcc_mcastgrp; zlog_debug( - "Sending Request for New Channel Oil Information(%s) VIIF %d(%s)", + "Sending Request for New Channel Oil Information%s VIIF %d(%s)", pim_str_sg_dump(&more), c_oil->oil.mfcc_parent, c_oil->pim->vrf->name); } -- 2.39.5