zebra: use "assert" instead of unnecessary check

Like `zvni_map_to_svi_ns()` for `ns_walk_func()`, just use "assert"
instead of unnecessary check.

Since these parameters for `ns_walk_func()`, e.g. `in_param` and others,
must not be NULL. So use `assert` to ensure the these parameters, and
remove those unnecessary checks.

Signed-off-by: anlan_cs <vic.lan@pica8.com>

diff --git a/zebra/zebra_evpn.c b/zebra/zebra_evpn.c
index d9d21462fb970f86bea6f279bc4cb24ccb68aa61..d223a21edaca508b9b1c1fd7b63acaafa8fe5aab 100644 (file)
--- a/zebra/zebra_evpn.c
+++ b/zebra/zebra_evpn.c
@@ -649,10 +649,9 @@ static int zebra_evpn_map_vlan_ns(struct ns *ns,
        struct zebra_l2info_vxlan *vxl = NULL;
        struct zebra_from_svi_param *in_param =
                (struct zebra_from_svi_param *)_in_param;
-       int found = 0;
 
-       if (!in_param)
-               return NS_WALK_STOP;
+       assert(p_zevpn && in_param);
+
        br_if = in_param->br_if;
        zif = in_param->zif;
        assert(zif);
@@ -676,17 +675,13 @@ static int zebra_evpn_map_vlan_ns(struct ns *ns,
 
                if (!in_param->bridge_vlan_aware
                    || vxl->access_vlan == in_param->vid) {
-                       found = 1;
-                       break;
+                       zevpn = zebra_evpn_lookup(vxl->vni);
+                       *p_zevpn = zevpn;
+                       return NS_WALK_STOP;
                }
        }
-       if (!found)
-               return NS_WALK_CONTINUE;
 
-       zevpn = zebra_evpn_lookup(vxl->vni);
-       if (p_zevpn)
-               *p_zevpn = zevpn;
-       return NS_WALK_STOP;
+       return NS_WALK_CONTINUE;
 }
 
 /*
@@ -831,8 +826,7 @@ static int zvni_map_to_macvlan_ns(struct ns *ns,
        struct interface *tmp_if = NULL;
        struct zebra_if *zif;
 
-       if (!in_param)
-               return NS_WALK_STOP;
+       assert(in_param && p_ifp);
 
        /* Identify corresponding VLAN interface. */
        for (rn = route_top(zns->if_table); rn; rn = route_next(rn)) {
@@ -846,8 +840,7 @@ static int zvni_map_to_macvlan_ns(struct ns *ns,
                        continue;
 
                if (zif->link == in_param->svi_if) {
-                       if (p_ifp)
-                               *p_ifp = tmp_if;
+                       *p_ifp = tmp_if;
                        return NS_WALK_STOP;
                }
        }

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 13e1f63457b5544f0af457dd6feb2e67bdc4020f..f32a4c6010d5cc156f4cf52e34ba8745065d3008 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -1754,6 +1754,8 @@ static int zl3vni_map_to_vxlan_if_ns(struct ns *ns,
        if (!zvrf)
                return NS_WALK_STOP;
 
+       assert(_pifp);
+
        /* loop through all vxlan-interface */
        for (rn = route_top(zns->if_table); rn; rn = route_next(rn)) {
 
@@ -1784,8 +1786,7 @@ static int zl3vni_map_to_vxlan_if_ns(struct ns *ns,
 
 
                zl3vni->local_vtep_ip = vxl->vtep_ip;
-               if (_pifp)
-                       *_pifp = (void *)ifp;
+               *_pifp = (void *)ifp;
                return NS_WALK_STOP;
        }
 
@@ -1856,7 +1857,6 @@ struct zebra_l3vni *zl3vni_from_vrf(vrf_id_t vrf_id)
 
 static int zl3vni_from_svi_ns(struct ns *ns, void *_in_param, void **_p_zl3vni)
 {
-       int found = 0;
        struct zebra_ns *zns = ns->info;
        struct zebra_l3vni **p_zl3vni = (struct zebra_l3vni **)_p_zl3vni;
        struct zebra_from_svi_param *in_param =
@@ -1866,8 +1866,7 @@ static int zl3vni_from_svi_ns(struct ns *ns, void *_in_param, void **_p_zl3vni)
        struct zebra_if *zif = NULL;
        struct zebra_l2info_vxlan *vxl = NULL;
 
-       if (!in_param)
-               return NS_WALK_STOP;
+       assert(in_param && p_zl3vni);
 
        /* loop through all vxlan-interface */
        for (rn = route_top(zns->if_table); rn; rn = route_next(rn)) {
@@ -1886,17 +1885,12 @@ static int zl3vni_from_svi_ns(struct ns *ns, void *_in_param, void **_p_zl3vni)
 
                if (!in_param->bridge_vlan_aware
                    || vxl->access_vlan == in_param->vid) {
-                       found = 1;
-                       break;
+                       *p_zl3vni = zl3vni_lookup(vxl->vni);
+                       return NS_WALK_STOP;
                }
        }
 
-       if (!found)
-               return NS_WALK_CONTINUE;
-
-       if (p_zl3vni)
-               *p_zl3vni = zl3vni_lookup(vxl->vni);
-       return NS_WALK_STOP;
+       return NS_WALK_CONTINUE;
 }
 
 /*