From: Mark Stapp <mjs@voltanet.io>
Date: Fri, 20 Jul 2018 18:43:32 +0000 (-0400)
Subject: zebra: Fix style issues
X-Git-Tag: frr-7.1-dev~233^2~12
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fe2c53d4ea87c63762547fdee42ae49e1577a681;p=matthieu%2Ffrr.git

zebra: Fix style issues

Clean up a couple of checkstyle reports in the dataplane
commit.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index e5fc27bcca..ab1d80f900 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -2228,7 +2228,7 @@ enum zebra_dplane_result kernel_route_update(dplane_ctx_h ctx)
 			 * of the route delete.  If that happens yeah we're
 			 * screwed.
 			 */
-			(void )netlink_route_multipath_ctx(RTM_DELROUTE, ctx);
+			(void)netlink_route_multipath_ctx(RTM_DELROUTE, ctx);
 			cmd = RTM_NEWROUTE;
 		}
 
diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h
index 4cd75961a3..2bcc85c36b 100644
--- a/zebra/zebra_dplane.h
+++ b/zebra/zebra_dplane.h
@@ -180,8 +180,7 @@ enum zebra_dplane_result dplane_route_update(struct route_node *rn,
 enum zebra_dplane_result dplane_route_delete(struct route_node *rn,
 					     struct route_entry *re);
 
-/* Opaque handle to a dataplane provider plugin */
-
+/* Support string name for a dataplane provider */
 #define DPLANE_PROVIDER_NAMELEN 64
 
 /* Priority or ordering values for providers. The idea is that there may be
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 87bf081a5d..b89d285118 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1819,8 +1819,7 @@ static void rib_process(struct route_node *rn)
 
 	if (IS_ZEBRA_DEBUG_RIB_DETAILED) {
 		zlog_debug(
-			"%u:%s: After processing: old_selected %p "
-			"new_selected %p old_fib %p new_fib %p",
+			"%u:%s: After processing: old_selected %p new_selected %p old_fib %p new_fib %p",
 			vrf_id, buf, (void *)old_selected, (void *)new_selected,
 			(void *)old_fib, (void *)new_fib);
 	}
@@ -1966,8 +1965,7 @@ static void rib_process_after(dplane_ctx_h ctx)
 					      dplane_ctx_get_table(ctx));
 	if (table == NULL) {
 		if (IS_ZEBRA_DEBUG_DPLANE) {
-			zlog_debug("Failed to process dplane results: no table "
-				   "for afi %d, safi %d, vrf %u",
+			zlog_debug("Failed to process dplane results: no table for afi %d, safi %d, vrf %u",
 				   dplane_ctx_get_afi(ctx),
 				   dplane_ctx_get_safi(ctx),
 				   dplane_ctx_get_vrf(ctx));
@@ -1990,8 +1988,7 @@ static void rib_process_after(dplane_ctx_h ctx)
 			       src_pfx ? (struct prefix_ipv6 *)src_pfx : NULL);
 	if (rn == NULL) {
 		if (IS_ZEBRA_DEBUG_DPLANE) {
-			zlog_debug("Failed to process dplane results: no "
-				   "route for %u:%s",
+			zlog_debug("Failed to process dplane results: no route for %u:%s",
 				   dplane_ctx_get_vrf(ctx), dest_str);
 		}
 		goto done;