zebra: Fix style issues

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

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2018-07-20 14:43:32 -04:00
parent 5af4b34689
commit fe2c53d4ea
3 changed files with 5 additions and 9 deletions

View File

@ -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 * of the route delete. If that happens yeah we're
* screwed. * screwed.
*/ */
(void )netlink_route_multipath_ctx(RTM_DELROUTE, ctx); (void)netlink_route_multipath_ctx(RTM_DELROUTE, ctx);
cmd = RTM_NEWROUTE; cmd = RTM_NEWROUTE;
} }

View File

@ -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, enum zebra_dplane_result dplane_route_delete(struct route_node *rn,
struct route_entry *re); struct route_entry *re);
/* Opaque handle to a dataplane provider plugin */ /* Support string name for a dataplane provider */
#define DPLANE_PROVIDER_NAMELEN 64 #define DPLANE_PROVIDER_NAMELEN 64
/* Priority or ordering values for providers. The idea is that there may be /* Priority or ordering values for providers. The idea is that there may be

View File

@ -1819,8 +1819,7 @@ static void rib_process(struct route_node *rn)
if (IS_ZEBRA_DEBUG_RIB_DETAILED) { if (IS_ZEBRA_DEBUG_RIB_DETAILED) {
zlog_debug( zlog_debug(
"%u:%s: After processing: old_selected %p " "%u:%s: After processing: old_selected %p new_selected %p old_fib %p new_fib %p",
"new_selected %p old_fib %p new_fib %p",
vrf_id, buf, (void *)old_selected, (void *)new_selected, vrf_id, buf, (void *)old_selected, (void *)new_selected,
(void *)old_fib, (void *)new_fib); (void *)old_fib, (void *)new_fib);
} }
@ -1966,8 +1965,7 @@ static void rib_process_after(dplane_ctx_h ctx)
dplane_ctx_get_table(ctx)); dplane_ctx_get_table(ctx));
if (table == NULL) { if (table == NULL) {
if (IS_ZEBRA_DEBUG_DPLANE) { if (IS_ZEBRA_DEBUG_DPLANE) {
zlog_debug("Failed to process dplane results: no table " zlog_debug("Failed to process dplane results: no table for afi %d, safi %d, vrf %u",
"for afi %d, safi %d, vrf %u",
dplane_ctx_get_afi(ctx), dplane_ctx_get_afi(ctx),
dplane_ctx_get_safi(ctx), dplane_ctx_get_safi(ctx),
dplane_ctx_get_vrf(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); src_pfx ? (struct prefix_ipv6 *)src_pfx : NULL);
if (rn == NULL) { if (rn == NULL) {
if (IS_ZEBRA_DEBUG_DPLANE) { if (IS_ZEBRA_DEBUG_DPLANE) {
zlog_debug("Failed to process dplane results: no " zlog_debug("Failed to process dplane results: no route for %u:%s",
"route for %u:%s",
dplane_ctx_get_vrf(ctx), dest_str); dplane_ctx_get_vrf(ctx), dest_str);
} }
goto done; goto done;