fix coding style

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index f509d869a37da53149f16cb7359d2c7a2db27f8e..20955fb83c83ea83b68ba00af0276657fb4b5959 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1400,12 +1400,12 @@ static int install_uninstall_routes_for_vni(struct bgp *bgp,
                                            bgp_evpn_route_type rtype,
                                            int install)
 {
-       afi_t                   afi;
-       safi_t                  safi;
-       struct bgp_node         *rd_rn, *rn;
-       struct bgp_table        *table;
-       struct bgp_info         *ri;
-       int                     ret;
+       afi_t afi;
+       safi_t safi;
+       struct bgp_node *rd_rn, *rn;
+       struct bgp_table *table;
+       struct bgp_info *ri;
+       int ret;
 
        afi = AFI_L2VPN;
        safi = SAFI_EVPN;
@@ -2639,11 +2639,11 @@ int bgp_evpn_unimport_route(struct bgp *bgp, afi_t afi, safi_t safi,
 /* filter routes which have martian next hops */
 int bgp_filter_evpn_routes_upon_martian_nh_change(struct bgp *bgp)
 {
-       afi_t                   afi;
-       safi_t                  safi;
-       struct bgp_node         *rd_rn, *rn;
-       struct bgp_table        *table;
-       struct bgp_info         *ri;
+       afi_t afi;
+       safi_t safi;
+       struct bgp_node *rd_rn, *rn;
+       struct bgp_table *table;
+       struct bgp_info *ri;
 
        afi = AFI_L2VPN;
        safi = SAFI_EVPN;

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index a198e65128180e34673e7fa6ae0efd46ae65d981..e8e986d1fcd93aaa370844032b9e479e3646c84a 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -2505,16 +2505,16 @@ DEFUN(show_bgp_l2vpn_evpn_route_rd_macip,
       "IP address (IPv4 or IPv6)\n"
       JSON_STR)
 {
-       struct bgp              *bgp;
-       int                     ret;
-       struct prefix_rd        prd;
-       struct ethaddr          mac;
-       struct ipaddr           ip;
-       int                     rd_idx = 0;
-       int                     mac_idx = 0;
-       int                     ip_idx = 0;
-       int                     uj = 0;
-       json_object             *json = NULL;
+       struct bgp *bgp;
+       int ret;
+       struct prefix_rd prd;
+       struct ethaddr mac;
+       struct ipaddr ip;
+       int rd_idx = 0;
+       int mac_idx = 0;
+       int ip_idx = 0;
+       int uj = 0;
+       json_object *json = NULL;
 
        memset(&mac, 0, sizeof(struct ethaddr));
        memset(&ip, 0, sizeof(struct ipaddr));

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index b988fbf738be876ca563e9a3b199c4e64e46f86f..69c4ee1b67f3c8e578f721cdd18669be9ec8b967 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -90,8 +90,8 @@ static void bgp_nexthop_cache_reset(struct bgp_table *table)
 
 static void *bgp_tip_hash_alloc(void *p)
 {
-       const struct in_addr    *val = (const struct in_addr *)p;
-       struct tip_addr         *addr;
+       const struct in_addr *val = (const struct in_addr *)p;
+       struct tip_addr *addr;
 
        addr = XMALLOC(MTYPE_TIP_ADDR, sizeof(struct tip_addr));
        addr->refcnt = 0;
@@ -107,15 +107,15 @@ static void bgp_tip_hash_free(void *addr)
 
 static unsigned int bgp_tip_hash_key_make(void *p)
 {
-       const struct tip_addr   *addr = p;
+       const struct tip_addr *addr = p;
 
        return jhash_1word(addr->addr.s_addr, 0);
 }
 
 static int bgp_tip_hash_cmp(const void *p1, const void *p2)
 {
-       const struct tip_addr   *addr1 = p1;
-       const struct tip_addr   *addr2 = p2;
+       const struct tip_addr *addr1 = p1;
+       const struct tip_addr *addr2 = p2;
 
        return addr1->addr.s_addr == addr2->addr.s_addr;
 }
@@ -137,8 +137,8 @@ void bgp_tip_hash_destroy(struct bgp *bgp)
 
 void bgp_tip_add(struct bgp *bgp, struct in_addr *tip)
 {
-       struct tip_addr         tmp;
-       struct tip_addr         *addr;
+       struct tip_addr tmp;
+       struct tip_addr *addr;
 
        tmp.addr = *tip;
 
@@ -151,8 +151,8 @@ void bgp_tip_add(struct bgp *bgp, struct in_addr *tip)
 
 void bgp_tip_del(struct bgp *bgp, struct in_addr *tip)
 {
-       struct tip_addr         tmp;
-       struct tip_addr         *addr;
+       struct tip_addr tmp;
+       struct tip_addr *addr;
 
        tmp.addr = *tip;
 

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 428b4f3626252533eea373d2dd7103afa6f7e71c..36063af7cda06e2e8ab161c893e33dcf2fb61599 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8358,7 +8358,7 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
 #if defined(HAVE_CUMULUS)
        char buf3[EVPN_ROUTE_STRLEN];
 #endif
-       char  prefix_str[BUFSIZ];
+       char prefix_str[BUFSIZ];
        int count = 0;
        int best = 0;
        int suppress = 0;

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 60361adbb6b6254374a6445ea68d3a796f6c1fb5..c333d4df2cd913632e7c72373d8c07de34d0c11c 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6426,7 +6426,7 @@ DEFUN (show_bgp_vrfs,
 
 static void show_address_entry(struct hash_backet *backet, void *args)
 {
-       struct vty      *vty = (struct vty *) args;
+       struct vty *vty = (struct vty *) args;
        struct bgp_addr *addr = (struct bgp_addr *) backet->data;
 
        vty_out(vty, "addr: %s, count: %d\n",
@@ -6436,7 +6436,7 @@ static void show_address_entry(struct hash_backet *backet, void *args)
 
 static void show_tip_entry(struct hash_backet *backet, void *args)
 {
-       struct vty      *vty = (struct vty *)args;
+       struct vty *vty = (struct vty *)args;
        struct tip_addr *tip = (struct tip_addr *) backet->data;
 
        vty_out(vty, "addr: %s, count: %d\n",
@@ -6465,7 +6465,7 @@ DEFUN (show_bgp_martian_nexthop_db,
        "martian next-hops\n"
        "martian next-hop database\n")
 {
-       struct bgp              *bgp = NULL;
+       struct bgp *bgp = NULL;
 
        bgp = bgp_get_default();
        if (!bgp) {
@@ -7396,14 +7396,14 @@ static void bgp_show_peer_afi(struct vty *vty, struct peer *p, afi_t afi,
                              safi_t safi, u_char use_json,
                              json_object *json_neigh)
 {
-       struct bgp_filter       *filter;
-       struct peer_af          *paf;
-       char                    orf_pfx_name[BUFSIZ];
-       int                     orf_pfx_count;
-       json_object             *json_af = NULL;
-       json_object             *json_prefA = NULL;
-       json_object             *json_prefB = NULL;
-       json_object             *json_addr = NULL;
+       struct bgp_filter *filter;
+       struct peer_af *paf;
+       char orf_pfx_name[BUFSIZ];
+       int orf_pfx_count;
+       json_object *json_af = NULL;
+       json_object *json_prefA = NULL;
+       json_object *json_prefB = NULL;
+       json_object *json_addr = NULL;
 
        if (use_json) {
                json_addr = json_object_new_object();
@@ -9780,10 +9780,10 @@ static int bgp_show_neighbor(struct vty *vty, struct bgp *bgp,
 static void bgp_show_all_instances_neighbors_vty(struct vty *vty,
                                                 u_char use_json)
 {
-       struct listnode                 *node, *nnode;
-       struct bgp                      *bgp;
-       json_object                     *json = NULL;
-       int                             is_first = 1;
+       struct listnode *node, *nnode;
+       struct bgp *bgp;
+       json_object *json = NULL;
+       int is_first = 1;
 
        if (use_json)
                vty_out(vty, "{\n");

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index ad73f96d55a0e216e1d64abb3b09d7550a05d597..2fc75ea5a23c4f9075ba541fbac71a7be4ea7a40 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2107,10 +2107,10 @@ static void bgp_zebra_connected(struct zclient *zclient)
 static int bgp_zebra_process_local_vni(int command, struct zclient *zclient,
                                       zebra_size_t length, vrf_id_t vrf_id)
 {
-       struct stream           *s;
-       vni_t                   vni;
-       struct bgp              *bgp;
-       struct in_addr          vtep_ip;
+       struct stream *s;
+       vni_t vni;
+       struct bgp *bgp;
+       struct in_addr vtep_ip;
 
        s = zclient->ibuf;
        vni = stream_getl(s);

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 6cad2e97adec4e66f687a4488563e8515e9627a2..24d4ea36b7012e09ae013ce659287e31cdcf6aec 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2735,10 +2735,10 @@ static int bgp_startup_timer_expire(struct thread *thread)
 static struct bgp *bgp_create(as_t *as, const char *name,
                              enum bgp_instance_type inst_type)
 {
-       struct bgp              *bgp;
-       afi_t                   afi;
-       safi_t                  safi;
-       struct utsname          names;
+       struct bgp *bgp;
+       afi_t afi;
+       safi_t safi;
+       struct utsname names;
 
        uname(&names);