*: style for EC replacements

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

19 files changed, 93 insertions, 99 deletions

diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c
index f02cc4627..f581ebc6b 100644
--- a/zebra/if_ioctl.c
+++ b/zebra/if_ioctl.c
@@ -198,8 +198,8 @@ static int if_getaddrs(void)
 		ifp = if_lookup_by_name(ifap->ifa_name, VRF_DEFAULT);
 		if (ifp == NULL) {
 			flog_err(EC_LIB_INTERFACE,
-				  "if_getaddrs(): Can't lookup interface %s\n",
-				  ifap->ifa_name);
+				 "if_getaddrs(): Can't lookup interface %s\n",
+				 ifap->ifa_name);
 			continue;
 		}
 
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 286931b96..7942069fb 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -314,7 +314,7 @@ static void netlink_vrf_change(struct nlmsghdr *h, struct rtattr *tb,
 			      name); // It would create vrf
 		if (!vrf) {
 			flog_err(EC_LIB_INTERFACE, "VRF %s id %u not created",
-				  name, ifi->ifi_index);
+				 name, ifi->ifi_index);
 			return;
 		}
 
@@ -336,8 +336,8 @@ static void netlink_vrf_change(struct nlmsghdr *h, struct rtattr *tb,
 		/* Enable the created VRF. */
 		if (!vrf_enable(vrf)) {
 			flog_err(EC_LIB_INTERFACE,
-				  "Failed to enable VRF %s id %u", name,
-				  ifi->ifi_index);
+				 "Failed to enable VRF %s id %u", name,
+				 ifi->ifi_index);
 			return;
 		}
 
diff --git a/zebra/ipforward_sysctl.c b/zebra/ipforward_sysctl.c
index fcf86afef..cc9421c27 100644
--- a/zebra/ipforward_sysctl.c
+++ b/zebra/ipforward_sysctl.c
@@ -43,7 +43,8 @@ int ipforward(void)
 
 	len = sizeof ipforwarding;
 	if (sysctl(mib, MIB_SIZ, &ipforwarding, &len, 0, 0) < 0) {
-		flog_err_sys(EC_LIB_SYSTEM_CALL, "Can't get ipforwarding value");
+		flog_err_sys(EC_LIB_SYSTEM_CALL,
+			     "Can't get ipforwarding value");
 		return -1;
 	}
 	return ipforwarding;
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index ce1bfdf50..9300ba603 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -90,8 +90,7 @@ int irdp_sock_init(void)
 	}
 
 	if (sock < 0) {
-		flog_err_sys(EC_LIB_SOCKET,
-			     "IRDP: can't create irdp socket %s",
+		flog_err_sys(EC_LIB_SOCKET, "IRDP: can't create irdp socket %s",
 			     safe_strerror(save_errno));
 		return sock;
 	};
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 15235f0e4..2b5bf04ad 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -97,14 +97,14 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
 
 	if (len != iplen) {
 		flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
-			  "IRDP: RX length doesnt match IP length");
+			 "IRDP: RX length doesnt match IP length");
 		return;
 	}
 
 	if (iplen < ICMP_MINLEN) {
 		flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
-			  "IRDP: RX ICMP packet too short from %s\n",
-			  inet_ntoa(src));
+			 "IRDP: RX ICMP packet too short from %s\n",
+			 inet_ntoa(src));
 		return;
 	}
 
@@ -114,8 +114,8 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
 	 len of IP-header) 14+20 */
 	if (iplen > IRDP_RX_BUF - 34) {
 		flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
-			  "IRDP: RX ICMP packet too long from %s\n",
-			  inet_ntoa(src));
+			 "IRDP: RX ICMP packet too long from %s\n",
+			 inet_ntoa(src));
 		return;
 	}
 
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index bcdc35784..1b713cc8c 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -287,9 +287,9 @@ static int netlink_information_fetch(struct nlmsghdr *h, ns_id_t ns_id,
 		 * it to be sent up to us
 		 */
 		flog_err(EC_ZEBRA_UNKNOWN_NLMSG,
-			  "Unknown netlink nlmsg_type %s(%d) vrf %u\n",
-			  nl_msg_type_to_str(h->nlmsg_type), h->nlmsg_type,
-			  ns_id);
+			 "Unknown netlink nlmsg_type %s(%d) vrf %u\n",
+			 nl_msg_type_to_str(h->nlmsg_type), h->nlmsg_type,
+			 ns_id);
 		break;
 	}
 	return 0;
@@ -453,8 +453,7 @@ static void netlink_install_filter(int sock, __u32 pid)
 
 	if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))
 	    < 0)
-		flog_err_sys(EC_LIB_SOCKET,
-			     "Can't install socket filter: %s\n",
+		flog_err_sys(EC_LIB_SOCKET, "Can't install socket filter: %s\n",
 			     safe_strerror(errno));
 }
 
@@ -711,8 +710,8 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int),
 			if (errno == EWOULDBLOCK || errno == EAGAIN)
 				break;
 			flog_err(EC_ZEBRA_RECVMSG_OVERRUN,
-				  "%s recvmsg overrun: %s", nl->name,
-				  safe_strerror(errno));
+				 "%s recvmsg overrun: %s", nl->name,
+				 safe_strerror(errno));
 			/*
 			 *  In this case we are screwed.
 			 *  There is no good way to
@@ -729,8 +728,8 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int),
 
 		if (msg.msg_namelen != sizeof snl) {
 			flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-				  "%s sender address length error: length %d",
-				  nl->name, msg.msg_namelen);
+				 "%s sender address length error: length %d",
+				 nl->name, msg.msg_namelen);
 			return -1;
 		}
 
@@ -803,10 +802,9 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int),
 
 				if (h->nlmsg_len
 				    < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
-					flog_err(
-						EC_ZEBRA_NETLINK_LENGTH_ERROR,
-						"%s error: message truncated",
-						nl->name);
+					flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
+						 "%s error: message truncated",
+						 nl->name);
 					return -1;
 				}
 
@@ -901,13 +899,13 @@ int netlink_parse_info(int (*filter)(struct nlmsghdr *, ns_id_t, int),
 		/* After error care. */
 		if (msg.msg_flags & MSG_TRUNC) {
 			flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-				  "%s error: message truncated", nl->name);
+				 "%s error: message truncated", nl->name);
 			continue;
 		}
 		if (status) {
 			flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-				  "%s error: data remnant size %d", nl->name,
-				  status);
+				 "%s error: data remnant size %d", nl->name,
+				 status);
 			return -1;
 		}
 	}
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index a0624413e..8df5a3764 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -410,8 +410,8 @@ int ifm_read(struct if_msghdr *ifm)
 	/* paranoia: sanity check structure */
 	if (ifm->ifm_msglen < sizeof(struct if_msghdr)) {
 		flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-			  "ifm_read: ifm->ifm_msglen %d too short\n",
-			  ifm->ifm_msglen);
+			 "ifm_read: ifm->ifm_msglen %d too short\n",
+			 ifm->ifm_msglen);
 		return -1;
 	}
 
@@ -1392,8 +1392,7 @@ static void routing_socket(struct zebra_ns *zns)
 	}
 
 	if (routing_sock < 0) {
-		flog_err_sys(EC_LIB_SOCKET,
-			     "Can't init kernel routing socket");
+		flog_err_sys(EC_LIB_SOCKET, "Can't init kernel routing socket");
 		return;
 	}
 
diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 442126e6d..378a8ade4 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -84,8 +84,8 @@ static int relay_response_back(void)
 				  &vrf_id, &resp_cmd);
 	if (ret < 0 && errno != EAGAIN) {
 		flog_err(EC_ZEBRA_LM_RESPONSE,
-			  "Error reading Label Manager response: %s",
-			  strerror(errno));
+			 "Error reading Label Manager response: %s",
+			 strerror(errno));
 		return -1;
 	}
 	zlog_debug("Label Manager response received, %d bytes", size);
@@ -120,8 +120,8 @@ static int relay_response_back(void)
 	ret = writen(zserv->sock, dst->data, stream_get_endp(dst));
 	if (ret <= 0) {
 		flog_err(EC_ZEBRA_LM_RELAY_FAILED,
-			  "Error relaying LM response to %s instance %u: %s",
-			  proto_str, instance, strerror(errno));
+			 "Error relaying LM response to %s instance %u: %s",
+			 proto_str, instance, strerror(errno));
 		return -1;
 	}
 	zlog_debug("Relayed LM response (%d bytes) to %s instance %u", ret,
@@ -188,7 +188,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 
 	if (zclient->sock < 0) {
 		flog_err(EC_ZEBRA_LM_NO_SOCKET,
-			  "Unable to relay LM request: no socket");
+			 "Unable to relay LM request: no socket");
 		reply_error(cmd, zserv, vrf_id);
 		return -1;
 	}
@@ -218,8 +218,8 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 	/* check & set client instance if unset */
 	if (zserv->instance && zserv->instance != instance) {
 		flog_err(EC_ZEBRA_LM_BAD_INSTANCE,
-			  "Client instance(%u) != msg instance(%u)",
-			  zserv->instance, instance);
+			 "Client instance(%u) != msg instance(%u)",
+			 zserv->instance, instance);
 		return -1;
 	}
 
@@ -241,8 +241,8 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
 	ret = writen(zclient->sock, dst->data, stream_get_endp(dst));
 	if (ret <= 0) {
 		flog_err(EC_ZEBRA_LM_RELAY_FAILED,
-			  "Error relaying LM request from %s instance %u: %s",
-			  proto_str, instance, strerror(errno));
+			 "Error relaying LM request from %s instance %u: %s",
+			 proto_str, instance, strerror(errno));
 		reply_error(cmd, zserv, vrf_id);
 		return -1;
 	}
@@ -271,7 +271,7 @@ static int lm_zclient_connect(struct thread *t)
 
 	if (zclient_socket_connect(zclient) < 0) {
 		flog_err(EC_ZEBRA_LM_CLIENT_CONNECTION_FAILED,
-			  "Error connecting synchronous zclient!");
+			 "Error connecting synchronous zclient!");
 		thread_add_timer(zebrad.master, lm_zclient_connect, zclient,
 				 CONNECTION_DELAY, &zclient->t_connect);
 		return -1;
@@ -401,8 +401,8 @@ struct label_manager_chunk *assign_label_chunk(uint8_t proto,
 			     + 1;
 	if (lmc->start > MPLS_LABEL_UNRESERVED_MAX - size + 1) {
 		flog_err(EC_ZEBRA_LM_EXHAUSTED_LABELS,
-			  "Reached max labels. Start: %u, size: %u", lmc->start,
-			  size);
+			 "Reached max labels. Start: %u, size: %u", lmc->start,
+			 size);
 		XFREE(MTYPE_LM_CHUNK, lmc);
 		return NULL;
 	}
@@ -441,7 +441,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
 			continue;
 		if (lmc->proto != proto || lmc->instance != instance) {
 			flog_err(EC_ZEBRA_LM_DAEMON_MISMATCH,
-				  "%s: Daemon mismatch!!", __func__);
+				 "%s: Daemon mismatch!!", __func__);
 			continue;
 		}
 		lmc->proto = NO_PROTO;
@@ -452,7 +452,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
 	}
 	if (ret != 0)
 		flog_err(EC_ZEBRA_LM_UNRELEASED_CHUNK,
-			  "%s: Label chunk not released!!", __func__);
+			 "%s: Label chunk not released!!", __func__);
 
 	return ret;
 }
diff --git a/zebra/rule_socket.c b/zebra/rule_socket.c
index 42fb6346e..11d9e00eb 100644
--- a/zebra/rule_socket.c
+++ b/zebra/rule_socket.c
@@ -46,14 +46,14 @@
 enum dp_req_result kernel_add_pbr_rule(struct zebra_pbr_rule *rule)
 {
 	flog_err(EC_LIB_UNAVAILABLE, "%s not Implemented for this platform",
-		  __PRETTY_FUNCTION__);
+		 __PRETTY_FUNCTION__);
 	return DP_REQUEST_FAILURE;
 }
 
 enum dp_req_result kernel_del_pbr_rule(struct zebra_pbr_rule *rule)
 {
 	flog_err(EC_LIB_UNAVAILABLE, "%s not Implemented for this platform",
-		  __PRETTY_FUNCTION__);
+		 __PRETTY_FUNCTION__);
 	return DP_REQUEST_FAILURE;
 }
 
diff --git a/zebra/table_manager.c b/zebra/table_manager.c
index 05cf37f94..91b45f3f0 100644
--- a/zebra/table_manager.c
+++ b/zebra/table_manager.c
@@ -148,8 +148,7 @@ struct table_manager_chunk *assign_table_chunk(uint8_t proto, uint16_t instance,
 	tmc->start = start;
 	if (RT_TABLE_ID_UNRESERVED_MAX - size  + 1 < start) {
 		flog_err(EC_ZEBRA_TM_EXHAUSTED_IDS,
-			  "Reached max table id. Start/Size %u/%u", start,
-			  size);
+			 "Reached max table id. Start/Size %u/%u", start, size);
 		XFREE(MTYPE_TM_CHUNK, tmc);
 		return NULL;
 	}
@@ -187,7 +186,7 @@ int release_table_chunk(uint8_t proto, uint16_t instance, uint32_t start,
 			continue;
 		if (tmc->proto != proto || tmc->instance != instance) {
 			flog_err(EC_ZEBRA_TM_DAEMON_MISMATCH,
-				  "%s: Daemon mismatch!!", __func__);
+				 "%s: Daemon mismatch!!", __func__);
 			continue;
 		}
 		tmc->proto = NO_PROTO;
@@ -197,7 +196,7 @@ int release_table_chunk(uint8_t proto, uint16_t instance, uint32_t start,
 	}
 	if (ret != 0)
 		flog_err(EC_ZEBRA_TM_UNRELEASED_CHUNK,
-			  "%s: Table chunk not released!!", __func__);
+			 "%s: Table chunk not released!!", __func__);
 
 	return ret;
 }
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index d189b84e7..55c5b934f 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -1787,8 +1787,8 @@ static void zread_table_manager_connect(struct zserv *client,
 	/* accept only dynamic routing protocols */
 	if ((proto >= ZEBRA_ROUTE_MAX) || (proto <= ZEBRA_ROUTE_STATIC)) {
 		flog_err(EC_ZEBRA_TM_WRONG_PROTO,
-			  "client %d has wrong protocol %s", client->sock,
-			  zebra_route_string(proto));
+			 "client %d has wrong protocol %s", client->sock,
+			 zebra_route_string(proto));
 		zsend_table_manager_connect_response(client, vrf_id, 1);
 		return;
 	}
@@ -1827,8 +1827,8 @@ static void zread_label_manager_connect(struct zserv *client,
 	/* accept only dynamic routing protocols */
 	if ((proto >= ZEBRA_ROUTE_MAX) || (proto <= ZEBRA_ROUTE_STATIC)) {
 		flog_err(EC_ZEBRA_TM_WRONG_PROTO,
-			  "client %d has wrong protocol %s", client->sock,
-			  zebra_route_string(proto));
+			 "client %d has wrong protocol %s", client->sock,
+			 zebra_route_string(proto));
 		zsend_label_manager_connect_response(client, vrf_id, 1);
 		return;
 	}
@@ -1857,8 +1857,8 @@ static int msg_client_id_mismatch(const char *op, struct zserv *client,
 {
 	if (proto != client->proto) {
 		flog_err(EC_ZEBRA_PROTO_OR_INSTANCE_MISMATCH,
-			  "%s: msg vs client proto mismatch, client=%u msg=%u",
-			  op, client->proto, proto);
+			 "%s: msg vs client proto mismatch, client=%u msg=%u",
+			 op, client->proto, proto);
 		/* TODO: fail when BGP sets proto and instance */
 		/* return 1; */
 	}
@@ -1989,8 +1989,8 @@ static void zread_get_table_chunk(struct zserv *client, struct stream *msg,
 	tmc = assign_table_chunk(client->proto, client->instance, size);
 	if (!tmc)
 		flog_err(EC_ZEBRA_TM_CANNOT_ASSIGN_CHUNK,
-			  "%s: Unable to assign Table Chunk of size %u",
-			  __func__, size);
+			 "%s: Unable to assign Table Chunk of size %u",
+			 __func__, size);
 	else
 		zlog_debug("Assigned Table Chunk %u - %u", tmc->start,
 			   tmc->end);
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 13a2b6f51..35a5d69ee 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1518,9 +1518,8 @@ static inline void zfpm_init_message_format(const char *format)
 
 	if (!strcmp("netlink", format)) {
 		if (!have_netlink) {
-			flog_err(
-				EC_ZEBRA_NETLINK_NOT_AVAILABLE,
-				"FPM netlink message format is not available");
+			flog_err(EC_ZEBRA_NETLINK_NOT_AVAILABLE,
+				 "FPM netlink message format is not available");
 			return;
 		}
 		zfpm_g->message_format = ZFPM_MSG_FORMAT_NETLINK;
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index cf23d90f9..c19aeb626 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -1056,7 +1056,7 @@ static int lsp_processq_add(zebra_lsp_t *lsp)
 
 	if (zebrad.lsp_process_q == NULL) {
 		flog_err(EC_ZEBRA_WQ_NONEXISTENT,
-			  "%s: work_queue does not exist!", __func__);
+			 "%s: work_queue does not exist!", __func__);
 		return -1;
 	}
 
@@ -1699,7 +1699,7 @@ static int mpls_processq_init(struct zebra_t *zebra)
 	zebra->lsp_process_q = work_queue_new(zebra->master, "LSP processing");
 	if (!zebra->lsp_process_q) {
 		flog_err(EC_ZEBRA_WQ_NONEXISTENT,
-			  "%s: could not initialise work queue!", __func__);
+			 "%s: could not initialise work queue!", __func__);
 		return -1;
 	}
 
@@ -1918,8 +1918,8 @@ int zebra_mpls_fec_unregister(struct zebra_vrf *zvrf, struct prefix *p,
 	if (!fec) {
 		prefix2str(p, buf, BUFSIZ);
 		flog_err(EC_ZEBRA_FEC_RM_FAILED,
-			  "Failed to find FEC %s upon unregister, client %s",
-			  buf, zebra_route_string(client->proto));
+			 "Failed to find FEC %s upon unregister, client %s",
+			 buf, zebra_route_string(client->proto));
 		return -1;
 	}
 
@@ -2050,7 +2050,7 @@ int zebra_mpls_static_fec_add(struct zebra_vrf *zvrf, struct prefix *p,
 		if (!fec) {
 			prefix2str(p, buf, BUFSIZ);
 			flog_err(EC_ZEBRA_FEC_ADD_FAILED,
-				  "Failed to add FEC %s upon config", buf);
+				 "Failed to add FEC %s upon config", buf);
 			return -1;
 		}
 
@@ -2098,7 +2098,7 @@ int zebra_mpls_static_fec_del(struct zebra_vrf *zvrf, struct prefix *p)
 	if (!fec) {
 		prefix2str(p, buf, BUFSIZ);
 		flog_err(EC_ZEBRA_FEC_RM_FAILED,
-			  "Failed to find FEC %s upon delete", buf);
+			 "Failed to find FEC %s upon delete", buf);
 		return -1;
 	}
 
diff --git a/zebra/zebra_netns_id.c b/zebra/zebra_netns_id.c
index b8ed0e558..b26c0515f 100644
--- a/zebra/zebra_netns_id.c
+++ b/zebra/zebra_netns_id.c
@@ -116,7 +116,7 @@ static int send_receive(int sock, struct nlmsghdr *nlh, unsigned int seq,
 	}
 	if (msg.msg_flags & MSG_TRUNC) {
 		flog_err(EC_ZEBRA_NETLINK_LENGTH_ERROR,
-			  "netlink recvmsg : error message truncated");
+			 "netlink recvmsg : error message truncated");
 		return -1;
 	}
 	/* nlh already points to buf */
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index 1d7a59e06..b71124161 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -181,8 +181,8 @@ static int zebra_ptm_flush_messages(struct thread *thread)
 
 	switch (buffer_flush_available(ptm_cb.wb, ptm_cb.ptm_sock)) {
 	case BUFFER_ERROR:
-		flog_err_sys(EC_LIB_SOCKET, "%s ptm socket error: %s",
-			     __func__, safe_strerror(errno));
+		flog_err_sys(EC_LIB_SOCKET, "%s ptm socket error: %s", __func__,
+			     safe_strerror(errno));
 		close(ptm_cb.ptm_sock);
 		ptm_cb.ptm_sock = -1;
 		zebra_ptm_reset_status(0);
@@ -207,8 +207,8 @@ static int zebra_ptm_send_message(char *data, int size)
 	errno = 0;
 	switch (buffer_write(ptm_cb.wb, ptm_cb.ptm_sock, data, size)) {
 	case BUFFER_ERROR:
-		flog_err_sys(EC_LIB_SOCKET, "%s ptm socket error: %s",
-			     __func__, safe_strerror(errno));
+		flog_err_sys(EC_LIB_SOCKET, "%s ptm socket error: %s", __func__,
+			     safe_strerror(errno));
 		close(ptm_cb.ptm_sock);
 		ptm_cb.ptm_sock = -1;
 		zebra_ptm_reset_status(0);
@@ -506,7 +506,7 @@ static int zebra_ptm_handle_bfd_msg(void *arg, void *in_ctxt,
 
 	if (str2prefix(dest_str, &dest_prefix) == 0) {
 		flog_err(EC_ZEBRA_PREFIX_PARSE_ERROR,
-			  "%s: Peer addr %s not found", __func__, dest_str);
+			 "%s: Peer addr %s not found", __func__, dest_str);
 		return -1;
 	}
 
@@ -514,8 +514,8 @@ static int zebra_ptm_handle_bfd_msg(void *arg, void *in_ctxt,
 	if (strcmp(ZEBRA_PTM_INVALID_SRC_IP, src_str)) {
 		if (str2prefix(src_str, &src_prefix) == 0) {
 			flog_err(EC_ZEBRA_PREFIX_PARSE_ERROR,
-				  "%s: Local addr %s not found", __func__,
-				  src_str);
+				 "%s: Local addr %s not found", __func__,
+				 src_str);
 			return -1;
 		}
 	}
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index ec5f25356..5853bdd46 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -2013,7 +2013,7 @@ void rib_queue_add(struct route_node *rn)
 
 	if (zebrad.ribq == NULL) {
 		flog_err(EC_ZEBRA_WQ_NONEXISTENT,
-			  "%s: work_queue does not exist!", __func__);
+			 "%s: work_queue does not exist!", __func__);
 		return;
 	}
 
@@ -2069,7 +2069,7 @@ static void rib_queue_init(struct zebra_t *zebra)
 	if (!(zebra->ribq =
 		      work_queue_new(zebra->master, "route_node processing"))) {
 		flog_err(EC_ZEBRA_WQ_NONEXISTENT,
-			  "%s: could not initialise work queue!", __func__);
+			 "%s: could not initialise work queue!", __func__);
 		return;
 	}
 
@@ -2083,7 +2083,7 @@ static void rib_queue_init(struct zebra_t *zebra)
 
 	if (!(zebra->mq = meta_queue_new())) {
 		flog_err(EC_ZEBRA_WQ_NONEXISTENT,
-			  "%s: could not initialise meta queue!", __func__);
+			 "%s: could not initialise meta queue!", __func__);
 		return;
 	}
 	return;
@@ -2334,8 +2334,8 @@ void rib_lookup_and_dump(struct prefix_ipv4 *p, vrf_id_t vrf_id)
 	table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
 	if (!table) {
 		flog_err(EC_ZEBRA_TABLE_LOOKUP_FAILED,
-			  "%s:%u zebra_vrf_table() returned NULL", __func__,
-			  vrf_id);
+			 "%s:%u zebra_vrf_table() returned NULL", __func__,
+			 vrf_id);
 		return;
 	}
 
@@ -2382,8 +2382,8 @@ void rib_lookup_and_pushup(struct prefix_ipv4 *p, vrf_id_t vrf_id)
 
 	if (NULL == (table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id))) {
 		flog_err(EC_ZEBRA_TABLE_LOOKUP_FAILED,
-			  "%s:%u zebra_vrf_table() returned NULL", __func__,
-			  vrf_id);
+			 "%s:%u zebra_vrf_table() returned NULL", __func__,
+			 vrf_id);
 		return;
 	}
 
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index e9ef30c64..30062a072 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -872,8 +872,8 @@ static int send_client(struct rnh *rnh, struct zserv *client, rnh_type_t type,
 		break;
 	default:
 		flog_err(EC_ZEBRA_RNH_UNKNOWN_FAMILY,
-			  "%s: Unknown family (%d) notification attempted\n",
-			  __FUNCTION__, rn->p.family);
+			 "%s: Unknown family (%d) notification attempted\n",
+			 __FUNCTION__, rn->p.family);
 		break;
 	}
 	if (re) {
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 15a7747b2..a8c035f87 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -1773,9 +1773,9 @@ static int zvni_gw_macip_add(struct interface *ifp, zebra_vni_t *zvni,
 		mac = zvni_mac_add(zvni, macaddr);
 		if (!mac) {
 			flog_err(EC_ZEBRA_MAC_ADD_FAILED,
-				  "Failed to add MAC %s intf %s(%u) VID %u",
-				  prefix_mac2str(macaddr, buf, sizeof(buf)),
-				  ifp->name, ifp->ifindex, vxl->access_vlan);
+				 "Failed to add MAC %s intf %s(%u) VID %u",
+				 prefix_mac2str(macaddr, buf, sizeof(buf)),
+				 ifp->name, ifp->ifindex, vxl->access_vlan);
 			return -1;
 		}
 	}
@@ -3934,8 +3934,8 @@ static int zebra_vxlan_handle_vni_transition(struct zebra_vrf *zvrf, vni_t vni,
 		/* Delete the hash entry. */
 		if (zvni_del(zvni)) {
 			flog_err(EC_ZEBRA_VNI_DEL_FAILED,
-				  "Failed to del VNI hash %p, VNI %u", zvni,
-				  zvni->vni);
+				 "Failed to del VNI hash %p, VNI %u", zvni,
+				 zvni->vni);
 			return -1;
 		}
 	} else {
@@ -6049,8 +6049,8 @@ void zebra_vxlan_remote_vtep_add(ZAPI_HANDLER_ARGS)
 
 		if (zvni_vtep_add(zvni, &vtep_ip) == NULL) {
 			flog_err(EC_ZEBRA_VTEP_ADD_FAILED,
-				  "Failed to add remote VTEP, VNI %u zvni %p",
-				  vni, zvni);
+				 "Failed to add remote VTEP, VNI %u zvni %p",
+				 vni, zvni);
 			continue;
 		}
 
@@ -6470,8 +6470,8 @@ int zebra_vxlan_if_del(struct interface *ifp)
 		/* Delete the hash entry. */
 		if (zvni_del(zvni)) {
 			flog_err(EC_ZEBRA_VNI_DEL_FAILED,
-				  "Failed to del VNI hash %p, IF %s(%u) VNI %u",
-				  zvni, ifp->name, ifp->ifindex, zvni->vni);
+				 "Failed to del VNI hash %p, IF %s(%u) VNI %u",
+				 zvni, ifp->name, ifp->ifindex, zvni->vni);
 			return -1;
 		}
 	}
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 97fc43f8a..2f4bb22ff 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -798,9 +798,8 @@ void zserv_start(char *path)
 		ret = bind(zebrad.sock, (struct sockaddr *)&sa, sa_len);
 	}
 	if (ret < 0) {
-		flog_err_sys(EC_LIB_SOCKET,
-			     "Can't bind zserv socket on %s: %s", path,
-			     safe_strerror(errno));
+		flog_err_sys(EC_LIB_SOCKET, "Can't bind zserv socket on %s: %s",
+			     path, safe_strerror(errno));
 		close(zebrad.sock);
 		zebrad.sock = -1;
 		return;