*: 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>

6 files changed, 12 insertions, 12 deletions

diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c
index a3b337a0c..f06e45392 100644
--- a/ospfd/ospf_api.c
+++ b/ospfd/ospf_api.c
@@ -74,12 +74,12 @@ void api_opaque_lsa_print(struct lsa_header *data)
 	olsa = (struct opaque_lsa *)data;
 
 	opaquelen = ntohs(data->length) - OSPF_LSA_HEADER_SIZE;
-	zlog_debug("apiserver_lsa_print: opaquelen=%d\n", opaquelen);
+	zlog_debug("apiserver_lsa_print: opaquelen=%d", opaquelen);
 
 	for (i = 0; i < opaquelen; i++) {
 		zlog_debug("0x%x ", olsa->mydata[i]);
 	}
-	zlog_debug("\n");
+	zlog_debug(" ");
 }
 
 /* -----------------------------------------------------------
@@ -242,7 +242,7 @@ const char *ospf_api_errname(int errcode)
 void msg_print(struct msg *msg)
 {
 	if (!msg) {
-		zlog_debug("msg_print msg=NULL!\n");
+		zlog_debug("msg_print msg=NULL!");
 		return;
 	}
 
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index d0ee81872..6b9ff6556 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -2024,7 +2024,7 @@ int ospf_apiserver_del_if(struct interface *ifp)
 
 	/* zlog_warn for debugging */
 	zlog_warn("ospf_apiserver_del_if");
-	zlog_warn("ifp name=%s status=%d index=%d\n", ifp->name, ifp->status,
+	zlog_warn("ifp name=%s status=%d index=%d", ifp->name, ifp->status,
 		  ifp->ifindex);
 
 	oi = ospf_apiserver_if_lookup_by_ifp(ifp);
@@ -2110,7 +2110,7 @@ void ospf_apiserver_show_info(struct vty *vty, struct ospf_lsa *lsa)
 		for (i = 0; i < opaquelen; i++) {
 			zlog_debug("0x%x ", olsa->data[i]);
 		}
-		zlog_debug("\n");
+		zlog_debug("");
 	}
 	return;
 }
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
index 4a0d4add1..5f01edfbd 100644
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@ -1372,14 +1372,14 @@ static uint16_t show_vty_sr_algorithm(struct vty *vty, struct tlv_header *tlvh)
 	}
 
 	else {
-		zlog_debug("  Segment Routing Algorithm TLV:\n");
+		zlog_debug("  Segment Routing Algorithm TLV:");
 		for (i = 0; i < ntohs(algo->header.length); i++)
 			switch (algo->value[i]) {
 			case 0:
-				zlog_debug("    Algorithm %d: SPF\n", i);
+				zlog_debug("    Algorithm %d: SPF", i);
 				break;
 			case 1:
-				zlog_debug("    Algorithm %d: Strict SPF\n", i);
+				zlog_debug("    Algorithm %d: Strict SPF", i);
 				break;
 			default:
 				zlog_debug(
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index f068efc8d..c26545344 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -901,7 +901,7 @@ static struct ospf_lsa *lsdb_lookup_next(struct ospf_area *area, uint8_t *type,
 	/* Sanity check, if LSA type unknwon
 	   merley skip any LSA */
 	if ((i < OSPF_MIN_LSA) || (i >= OSPF_MAX_LSA)) {
-		zlog_debug("Strange request with LSA type %d\n", i);
+		zlog_debug("Strange request with LSA type %d", i);
 		return NULL;
 	}
 
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index 9c223facd..74dba273e 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -1140,13 +1140,13 @@ ospf_rtrs_print (struct route_table *rtrs)
               if (path->nexthop.s_addr == 0)
                 {
                   if (IS_DEBUG_OSPF_EVENT)
-                    zlog_debug ("   directly attached to %s\r\n",
+                    zlog_debug ("   directly attached to %s\r",
 				ifindex2ifname (path->ifindex), VRF_DEFAULT);
                 }
               else
                 {
                   if (IS_DEBUG_OSPF_EVENT)
-                    zlog_debug ("   via %s, %s\r\n",
+                    zlog_debug ("   via %s, %s\r",
 				inet_ntoa (path->nexthop),
 				ifindex2ifname (path->ifindex), VRF_DEFAULT);
                 }
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index f0ddf7cc0..a49352086 100644
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -1600,7 +1600,7 @@ static int ospf_sr_update_schedule(struct thread *t)
 	monotime(&stop_time);
 
 	if (IS_DEBUG_OSPF_SR)
-		zlog_debug("SR (%s): SPF Processing Time(usecs): %lld\n",
+		zlog_debug("SR (%s): SPF Processing Time(usecs): %lld",
 			   __func__,
 			   (stop_time.tv_sec - start_time.tv_sec) * 1000000LL
 				   + (stop_time.tv_usec - start_time.tv_usec));