summaryrefslogtreecommitdiffstats
path: root/zebra
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2019-03-14 19:41:15 +0100
committerQuentin Young <qlyoung@cumulusnetworks.com>2019-03-14 19:41:15 +0100
commit9165c5f5ff9586e4688b3cbac265d3593f1231cc (patch)
treead9f94dd4e5d49c33e955518800fda79dcd4643c /zebra
parentMerge pull request #3936 from donaldsharp/ospf_1000_club (diff)
downloadfrr-9165c5f5ff9586e4688b3cbac265d3593f1231cc.tar.xz
frr-9165c5f5ff9586e4688b3cbac265d3593f1231cc.zip
*: remove trailing newlines from zlog messages
Zlog puts its own newlines on, and doing this makes logs look nasty. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra')
-rw-r--r--zebra/irdp_main.c2
-rw-r--r--zebra/irdp_packet.c4
-rw-r--r--zebra/kernel_netlink.c2
-rw-r--r--zebra/kernel_socket.c2
-rw-r--r--zebra/rt_netlink.c2
-rw-r--r--zebra/zebra_ptm.c4
-rw-r--r--zebra/zebra_rnh.c6
7 files changed, 11 insertions, 11 deletions
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index a9734056b..38d241eaa 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -241,7 +241,7 @@ int irdp_send_thread(struct thread *t_advert)
timer = MAX_INITIAL_ADVERT_INTERVAL;
if (irdp->flags & IF_DEBUG_MISC)
- zlog_debug("IRDP: New timer for %s set to %u\n", ifp->name,
+ zlog_debug("IRDP: New timer for %s set to %u", ifp->name,
timer);
irdp->t_advertise = NULL;
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 774d84d66..280478762 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -166,7 +166,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
case ICMP_ROUTERSOLICIT:
if (irdp->flags & IF_DEBUG_MESSAGES)
- zlog_debug("IRDP: RX Solicit on %s from %s\n",
+ zlog_debug("IRDP: RX Solicit on %s from %s",
ifp->name, inet_ntoa(src));
process_solicit(ifp);
@@ -253,7 +253,7 @@ int irdp_read_raw(struct thread *r)
if (!(irdp->flags & IF_ACTIVE)) {
if (irdp->flags & IF_DEBUG_MISC)
- zlog_debug("IRDP: RX ICMP for disabled interface %s\n",
+ zlog_debug("IRDP: RX ICMP for disabled interface %s",
ifp->name);
return 0;
}
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 2f850c633..c5fbfd448 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -652,7 +652,7 @@ static void netlink_parse_extended_ack(struct nlmsghdr *h)
off = *(uint32_t *)RTA_DATA(tb[NLMSGERR_ATTR_OFFS]);
if (off > h->nlmsg_len) {
- zlog_err("Invalid offset for NLMSGERR_ATTR_OFFS\n");
+ zlog_err("Invalid offset for NLMSGERR_ATTR_OFFS");
} else if (!(h->nlmsg_flags & NLM_F_CAPPED)) {
/*
* Header of failed message
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 792756efe..ad4619190 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -622,7 +622,7 @@ int ifm_read(struct if_msghdr *ifm)
* RTA_IFP) is required.
*/
if (!ifnlen) {
- zlog_debug("Interface index %d (new) missing ifname\n",
+ zlog_debug("Interface index %d (new) missing ifname",
ifm->ifm_index);
return -1;
}
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index c56e2f316..cf61eb6cb 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -835,7 +835,7 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
if (!(h->nlmsg_type == RTM_NEWROUTE || h->nlmsg_type == RTM_DELROUTE)) {
/* If this is not route add/delete message print warning. */
- zlog_debug("Kernel message: %s NS %u\n",
+ zlog_debug("Kernel message: %s NS %u",
nl_msg_type_to_str(h->nlmsg_type), ns_id);
return 0;
}
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index cc5e38e69..bb352dc2f 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -328,7 +328,7 @@ DEFUN (zebra_ptm_enable_if,
if (!old_ptm_enable && ptm_cb.ptm_enable) {
if (!if_is_operative(ifp) && send_linkdown) {
if (IS_ZEBRA_DEBUG_EVENT)
- zlog_debug("%s: Bringing down interface %s\n",
+ zlog_debug("%s: Bringing down interface %s",
__func__, ifp->name);
if_down(ifp);
}
@@ -354,7 +354,7 @@ DEFUN (no_zebra_ptm_enable_if,
ifp->ptm_enable = ZEBRA_IF_PTM_ENABLE_OFF;
if (if_is_no_ptm_operative(ifp) && send_linkup) {
if (IS_ZEBRA_DEBUG_EVENT)
- zlog_debug("%s: Bringing up interface %s\n",
+ zlog_debug("%s: Bringing up interface %s",
__func__, ifp->name);
if_up(ifp);
}
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 52637c606..f601ab7e7 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -383,7 +383,7 @@ static void zebra_rnh_eval_import_check_entry(vrf_id_t vrfid, afi_t afi,
if (state_changed || force) {
if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
- zlog_debug("%u:%s: Route import check %s %s\n", vrfid,
+ zlog_debug("%u:%s: Route import check %s %s", vrfid,
bufn, rnh->state ? "passed" : "failed",
state_changed ? "(state changed)" : "");
}
@@ -775,7 +775,7 @@ void zebra_print_rnh_table(vrf_id_t vrfid, afi_t afi, struct vty *vty,
table = get_rnh_table(vrfid, afi, type);
if (!table) {
- zlog_debug("print_rnhs: rnh table not found\n");
+ zlog_debug("print_rnhs: rnh table not found");
return;
}
@@ -1025,7 +1025,7 @@ static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
ntable = get_rnh_table(vrf_id, afi, type);
if (!ntable) {
- zlog_debug("cleanup_rnh_client: rnh table not found\n");
+ zlog_debug("cleanup_rnh_client: rnh table not found");
return -1;
}