From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Fri, 23 Sep 2016 01:20:49 +0000 (+0000)
Subject: lib: argv update for distribute.c and ns.c
X-Git-Tag: frr-3.0-branchpoint~129^2~185
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c0c053fa13d77fa8261b81eaab13c21d4ed0f05a;p=matthieu%2Ffrr.git

lib: argv update for distribute.c and ns.c

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/lib/distribute.c b/lib/distribute.c
index 2a2647f23d..8a00833915 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -148,7 +148,7 @@ distribute_cmp (const struct distribute *dist1, const struct distribute *dist2)
 }
 
 /* Set access-list name to the distribute list. */
-static struct distribute *
+static void
 distribute_list_set (const char *ifname, enum distribute_type type, 
                      const char *alist_name)
 {
@@ -171,8 +171,6 @@ distribute_list_set (const char *ifname, enum distribute_type type,
 
   /* Apply this distribute-list to the interface. */
   (*distribute_add_hook) (dist);
-  
-  return dist;
 }
 
 /* Unset distribute-list.  If matched distribute-list exist then
@@ -226,7 +224,7 @@ distribute_list_unset (const char *ifname, enum distribute_type type,
 }
 
 /* Set access-list name to the distribute list. */
-static struct distribute *
+static void
 distribute_list_prefix_set (const char *ifname, enum distribute_type type,
 			    const char *plist_name)
 {
@@ -249,8 +247,6 @@ distribute_list_prefix_set (const char *ifname, enum distribute_type type,
 
   /* Apply this distribute-list to the interface. */
   (*distribute_add_hook) (dist);
-  
-  return dist;
 }
 
 /* Unset distribute-list.  If matched distribute-list exist then
@@ -319,7 +315,7 @@ DEFUN (distribute_list,
     DISTRIBUTE_IN : DISTRIBUTE_OUT;
 
   /* Set appropriate function call */
-  int (*distfn)(const char *, enum distribute_type, const char *) = prefix ? 
+  void (*distfn)(const char *, enum distribute_type, const char *) = prefix ? 
     &distribute_list_prefix_set : &distribute_list_set;
   
   /* if interface is present, get name */
diff --git a/lib/ns.c b/lib/ns.c
index 556350ed17..58b640651d 100644
--- a/lib/ns.c
+++ b/lib/ns.c
@@ -559,12 +559,12 @@ DEFUN (ns_netns,
 {
   ns_id_t ns_id = NS_DEFAULT;
   struct ns *ns = NULL;
-  char *pathname = ns_netns_pathname (vty, argv[1]);
+  char *pathname = ns_netns_pathname (vty, argv[3]->arg);
 
   if (!pathname)
     return CMD_WARNING;
 
-  VTY_GET_INTEGER ("NS ID", ns_id, argv[0]);
+  VTY_GET_INTEGER ("NS ID", ns_id, argv[1]->arg);
   ns = ns_get (ns_id);
 
   if (ns->name && strcmp (ns->name, pathname) != 0)
@@ -598,12 +598,12 @@ DEFUN (no_ns_netns,
 {
   ns_id_t ns_id = NS_DEFAULT;
   struct ns *ns = NULL;
-  char *pathname = ns_netns_pathname (vty, argv[1]);
+  char *pathname = ns_netns_pathname (vty, argv[4]->arg);
 
   if (!pathname)
     return CMD_WARNING;
 
-  VTY_GET_INTEGER ("NS ID", ns_id, argv[0]);
+  VTY_GET_INTEGER ("NS ID", ns_id, argv[2]->arg);
   ns = ns_lookup (ns_id);
 
   if (!ns)