zebra/lib: code cleaning

Remove useless parenthesis and explicit cast.
Remove redundant code.

Signed-off-by: Thibaut Collet <thibaut.collet@6wind.com>

diff --git a/lib/vrf.c b/lib/vrf.c
index 696ae3f48cf720ba3b7652b013803ac68985cab5..3ab830c5561a86a399061c9d809eb6e8c73737d8 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -493,18 +493,14 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
                          "vrf_init: failed to create the default VRF!");
                exit(1);
        }
                          "vrf_init: failed to create the default VRF!");
                exit(1);
        }

-       if (vrf_is_backend_netns())
-               strlcpy(default_vrf->data.l.netns_name,
-                       VRF_DEFAULT_NAME, NS_NAMSIZ);
-

        if (vrf_is_backend_netns()) {
                struct ns *ns;
 
                strlcpy(default_vrf->data.l.netns_name,
                        VRF_DEFAULT_NAME, NS_NAMSIZ);
                ns = ns_lookup(ns_get_default_id());
        if (vrf_is_backend_netns()) {
                struct ns *ns;
 
                strlcpy(default_vrf->data.l.netns_name,
                        VRF_DEFAULT_NAME, NS_NAMSIZ);
                ns = ns_lookup(ns_get_default_id());

-               ns->vrf_ctxt = (void *)default_vrf;
-               default_vrf->ns_ctxt = (void *)ns;
+               ns->vrf_ctxt = default_vrf;
+               default_vrf->ns_ctxt = ns;

        }
 
        /* Enable the default VRF. */
        }
 
        /* Enable the default VRF. */

diff --git a/zebra/interface.c b/zebra/interface.c
index bb87728b5d2179fde3caa285d1858937316665c2..48adfd5a3d2e5b26abcc06b428ceac1a7b15d6ea 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -733,7 +733,7 @@ void if_delete_update(struct interface *ifp)
         * occur with this implementation whereas it is not possible with
         * vrf-lite).
         */
         * occur with this implementation whereas it is not possible with
         * vrf-lite).
         */

-       if ((ifp->vrf_id) && !vrf_is_backend_netns())
+       if (ifp->vrf_id && !vrf_is_backend_netns())

                if_handle_vrf_change(ifp, VRF_DEFAULT);
 
        /* Reset some zebra interface params to default values. */
                if_handle_vrf_change(ifp, VRF_DEFAULT);
 
        /* Reset some zebra interface params to default values. */