bgpd: Cleanup warnings issued by CI system from these changes

Modify code to cleanup warnings issued by the CI system from
this series of changes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index ea107ae135574789c6feaa480cffed062b27cbb9..218b1de1cf669e383c3137308bc5cfd1d426d11b 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1899,28 +1899,25 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
                                                    != Established)
                                                        continue;
 
-                                       if (aspath_cmp_left(pi1->attr->aspath,
-                                                           pi2->attr->aspath)
-                                           || aspath_cmp_left_confed(
+                                       if (!aspath_cmp_left(pi1->attr->aspath,
+                                                            pi2->attr->aspath)
+                                           && !aspath_cmp_left_confed(
                                                       pi1->attr->aspath,
-                                                      pi2->attr->aspath)) {
-                                               if (bgp_path_info_cmp(
-                                                           bgp, pi2,
-                                                           new_select,
-                                                           &paths_eq,
-                                                           mpath_cfg, debug,
-                                                           pfx_buf, afi,
-                                                           safi)) {
-                                                       bgp_path_info_unset_flag(
-                                                               rn, new_select,
-                                                               BGP_PATH_DMED_SELECTED);
-                                                       new_select = pi2;
-                                               }
+                                                      pi2->attr->aspath))
+                                               continue;
 
-                                               bgp_path_info_set_flag(
-                                                       rn, pi2,
-                                                       BGP_PATH_DMED_CHECK);
+                                       if (bgp_path_info_cmp(
+                                                   bgp, pi2, new_select,
+                                                   &paths_eq, mpath_cfg, debug,
+                                                   pfx_buf, afi, safi)) {
+                                               bgp_path_info_unset_flag(
+                                                       rn, new_select,
+                                                       BGP_PATH_DMED_SELECTED);
+                                               new_select = pi2;
                                        }
+
+                                       bgp_path_info_set_flag(
+                                               rn, pi2, BGP_PATH_DMED_CHECK);
                                }
                        }
                        bgp_path_info_set_flag(rn, new_select,
@@ -8047,6 +8044,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct prefix *p,
                if (path->extra && bgp_is_valid_label(&path->extra->label[0])
                    && safi != SAFI_EVPN) {
                        mpls_label_t label = label_pton(&path->extra->label[0]);
+
                        if (json_paths)
                                json_object_int_add(json_path, "remoteLabel",
                                                    label);

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index 0595700bbc866c376c6e0c5e494d20ecf55ef7cc..6978dd145d88c88eca62c650dc9996ee2cf8efdd 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -483,9 +483,8 @@ void del_vnc_route(struct rfapi_descriptor *rfd,
                /*
                 * Delete local_nexthops list
                 */
-               if (bpi->extra && bpi->extra->vnc.export.local_nexthops) {
+               if (bpi->extra && bpi->extra->vnc.export.local_nexthops)
                        list_delete(&bpi->extra->vnc.export.local_nexthops);
-               }
 
                bgp_aggregate_decrement(bgp, p, bpi, afi, safi);
                bgp_path_info_delete(bn, bpi);

diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index 193cbc2b7dcbf092d96ec4f911fc6b0af419eb90..f0797827ce65e8e9a620d79282330dc7cf3b335c 100644 (file)
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -317,7 +317,8 @@ static int run_bgp_path_info_mpath_update(testcase_t *t)
        bgp_mp_list_add(&mp_list, &test_mp_list_info[1]);
        new_best = &test_mp_list_info[3];
        old_best = NULL;
-       bgp_path_info_mpath_update(&test_rn, new_best, old_best, &mp_list, &mp_cfg);
+       bgp_path_info_mpath_update(&test_rn, new_best, old_best, &mp_list,
+                                  &mp_cfg);
        bgp_mp_list_clear(&mp_list);
        EXPECT_TRUE(bgp_path_info_mpath_count(new_best) == 2, test_result);
        mpath = bgp_path_info_mpath_first(new_best);
@@ -331,7 +332,8 @@ static int run_bgp_path_info_mpath_update(testcase_t *t)
        bgp_mp_list_add(&mp_list, &test_mp_list_info[1]);
        new_best = &test_mp_list_info[0];
        old_best = &test_mp_list_info[3];
-       bgp_path_info_mpath_update(&test_rn, new_best, old_best, &mp_list, &mp_cfg);
+       bgp_path_info_mpath_update(&test_rn, new_best, old_best, &mp_list,
+                                  &mp_cfg);
        bgp_mp_list_clear(&mp_list);
        EXPECT_TRUE(bgp_path_info_mpath_count(new_best) == 1, test_result);
        mpath = bgp_path_info_mpath_first(new_best);