zebra: Remove helper function if_nhg_dependents_is_empty

Let's just let the function figure this out.

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

diff --git a/zebra/interface.c b/zebra/interface.c
index 6624eb2591652bf8b2df991cbf1bb277315277f3..829f9dab61c42e86e2a14084f05e98f7c29535b3 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -983,18 +983,6 @@ unsigned int if_nhg_dependents_count(const struct interface *ifp)
        return 0;
 }
 
-
-bool if_nhg_dependents_is_empty(const struct interface *ifp)
-{
-       if (ifp->info) {
-               struct zebra_if *zif = (struct zebra_if *)ifp->info;
-
-               return nhg_connected_tree_is_empty(&zif->nhg_dependents);
-       }
-
-       return false;
-}
-
 /* Interface is up. */
 void if_up(struct interface *ifp, bool install_connected)
 {

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 70b71fe7070c2a5d64bc60f747785f19cbddff2a..422acf08378f98e7cc41f2cedc4e167c71b9c4ed 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1476,17 +1476,18 @@ static void if_nexthop_group_dump_vty(struct vty *vty, struct interface *ifp)
 {
        struct zebra_if *zebra_if = NULL;
        struct nhg_connected *rb_node_dep = NULL;
+       bool first = true;
 
        zebra_if = ifp->info;
 
-       if (!if_nhg_dependents_is_empty(ifp)) {
-               vty_out(vty, "Interface %s:\n", ifp->name);
-
-               frr_each(nhg_connected_tree, &zebra_if->nhg_dependents,
-                         rb_node_dep) {
-                       vty_out(vty, "   ");
-                       show_nexthop_group_out(vty, rb_node_dep->nhe, NULL);
+       frr_each (nhg_connected_tree, &zebra_if->nhg_dependents, rb_node_dep) {
+               if (first) {
+                       vty_out(vty, "Interface %s:\n", ifp->name);
+                       first = false;
                }
+
+               vty_out(vty, "   ");
+               show_nexthop_group_out(vty, rb_node_dep->nhe, NULL);
        }
 }