From 2ba6be5b24c9c572d167248004fb1e3c4b57e0a2 Mon Sep 17 00:00:00 2001 From: Hiroki Shirokura Date: Wed, 5 May 2021 10:37:55 +0000 Subject: [PATCH] bgpd,sharpd,zebra: fix code style Signed-off-by: Hiroki Shirokura --- bgpd/bgp_nht.c | 2 +- sharpd/sharp_vty.c | 7 ++++--- sharpd/sharp_zebra.h | 7 ++----- zebra/zebra_vty.c | 15 ++++++++------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index f046235610..4b4a3716e6 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -79,7 +79,7 @@ static int bgp_isvalid_labeled_nexthop(struct bgp_nexthop_cache *bnc) return (bgp_zebra_num_connects() == 0 || (bnc && bnc->nexthop_num > 0 && (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_LABELED_VALID) - || bnc->bgp->srv6_enabled))); + || bnc->bgp->srv6_enabled))); } static void bgp_unlink_nexthop_check(struct bgp_nexthop_cache *bnc) diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c index 1a3c5f4502..250151b1fa 100644 --- a/sharpd/sharp_vty.c +++ b/sharpd/sharp_vty.c @@ -505,9 +505,10 @@ DEFPY (install_seg6local_routes, nexthop_add_srv6_seg6local(&sg.r.nhop, action, &ctx); sg.r.vrf_id = vrf->vrf_id; - sharp_install_routes_helper(&sg.r.orig_prefix, sg.r.vrf_id, sg.r.inst, 0, - &sg.r.nhop_group, &sg.r.backup_nhop_group, - routes, route_flags, sg.r.opaque); + sharp_install_routes_helper(&sg.r.orig_prefix, sg.r.vrf_id, sg.r.inst, + 0, &sg.r.nhop_group, + &sg.r.backup_nhop_group, routes, + route_flags, sg.r.opaque); return CMD_SUCCESS; } diff --git a/sharpd/sharp_zebra.h b/sharpd/sharp_zebra.h index 45e26a9b3d..49f11a67e8 100644 --- a/sharpd/sharp_zebra.h +++ b/sharpd/sharp_zebra.h @@ -66,11 +66,8 @@ extern void sharp_zebra_register_te(void); extern void sharp_redistribute_vrf(struct vrf *vrf, int source); -extern int sharp_zebra_srv6_manager_get_locator_chunk(const char* locator_name); -extern int sharp_zebra_srv6_manager_release_locator_chunk(const char *locator_name); -extern int sharp_zebra_srv6_manager_get_locator_chunk(const char *locator_name); -extern int sharp_zebra_srv6_manager_release_locator_chunk( - const char *locator_name); +extern int sharp_zebra_srv6_manager_get_locator_chunk(const char *lname); +extern int sharp_zebra_srv6_manager_release_locator_chunk(const char *lname); extern void sharp_install_seg6local_route_helper(struct prefix *p, uint8_t instance, enum seg6local_action_t act, diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 2bc25f6f7d..51f19a3c03 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -657,11 +657,11 @@ static void show_route_nexthop_helper(struct vty *vty, seg6local_context2str(buf, sizeof(buf), &nexthop->nh_srv6->seg6local_ctx, nexthop->nh_srv6->seg6local_action); - vty_out(vty, ", seg6local %s %s", - seg6local_action2str(nexthop->nh_srv6->seg6local_action), - buf); + vty_out(vty, ", seg6local %s %s", seg6local_action2str( + nexthop->nh_srv6->seg6local_action), buf); - inet_ntop(AF_INET6, &nexthop->nh_srv6->seg6_segs, buf, sizeof(buf)); + inet_ntop(AF_INET6, &nexthop->nh_srv6->seg6_segs, buf, + sizeof(buf)); vty_out(vty, ", seg6 %s", buf); } @@ -870,13 +870,14 @@ static void show_nexthop_json_helper(json_object *json_nexthop, if (nexthop->nh_srv6) { json_seg6local = json_object_new_object(); json_object_string_add( - json_seg6local, "action", - seg6local_action2str(nexthop->nh_srv6->seg6local_action)); + json_seg6local, "action", seg6local_action2str( + nexthop->nh_srv6->seg6local_action)); json_object_object_add(json_nexthop, "seg6local", json_seg6local); json_seg6 = json_object_new_object(); - inet_ntop(AF_INET6, &nexthop->nh_srv6->seg6_segs, buf, sizeof(buf)); + inet_ntop(AF_INET6, &nexthop->nh_srv6->seg6_segs, buf, + sizeof(buf)); json_object_string_add(json_seg6, "segs", buf); json_object_object_add(json_nexthop, "seg6", json_seg6); } -- 2.39.5