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 e5fc27bcca80b637ddc9cfeeb050f33f758a0186..ab1d80f900309ee3ab7d1417f0a6d21521980afd 100644 (file)
--- 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 4cd75961a3dfb2fb97e211bffaa526a542ec0262..2bcc85c36b19c94b6ac1bae1c01613302555eb68 100644 (file)
--- 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 87bf081a5dd28930cc236ddde99d5cf1d1571b73..b89d2851185911f2473507cc55eadfe7e34ae0ae 100644 (file)
--- 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;