From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Fri, 23 Sep 2016 00:58:26 +0000 (+0000)
Subject: lib: argv update for filter.c, if_rmap.c keychain.c and plist.c
X-Git-Tag: frr-3.0-branchpoint~129^2~187
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6f1ccc12de0bb09560106ac7c1354ec627d97b48;p=matthieu%2Ffrr.git

lib: argv update for filter.c, if_rmap.c keychain.c and plist.c

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

diff --git a/lib/filter.c b/lib/filter.c
index e9ba715c92..33801ca11c 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -713,7 +713,7 @@ DEFUN (access_list_standard,
        "Address to match\n"
        "Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], argv[3],
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[3]->arg, argv[4]->arg,
 			   NULL, NULL, 0, 1);
 }
 
@@ -727,7 +727,7 @@ DEFUN (access_list_standard_nomask,
        "Specify packets to forward\n"
        "Address to match\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], "0.0.0.0",
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[3]->arg, "0.0.0.0",
 			   NULL, NULL, 0, 1);
 }
 
@@ -742,7 +742,7 @@ DEFUN (access_list_standard_host,
        "A single host address\n"
        "Address to match\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], "0.0.0.0",
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[4]->arg, "0.0.0.0",
 			   NULL, NULL, 0, 1);
 }
 
@@ -756,7 +756,7 @@ DEFUN (access_list_standard_any,
        "Specify packets to forward\n"
        "Any source host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, "0.0.0.0",
 			   "255.255.255.255", NULL, NULL, 0, 1);
 }
 
@@ -772,7 +772,7 @@ DEFUN (no_access_list_standard,
        "Address to match\n"
        "Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], argv[3],
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[4]->arg, argv[5]->arg,
 			   NULL, NULL, 0, 0);
 }
 
@@ -787,7 +787,7 @@ DEFUN (no_access_list_standard_nomask,
        "Specify packets to forward\n"
        "Address to match\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], "0.0.0.0",
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[4]->arg, "0.0.0.0",
 			   NULL, NULL, 0, 0);
 }
 
@@ -803,7 +803,7 @@ DEFUN (no_access_list_standard_host,
        "A single host address\n"
        "Address to match\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2], "0.0.0.0",
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[5]->arg, "0.0.0.0",
 			   NULL, NULL, 0, 0);
 }
 
@@ -818,7 +818,7 @@ DEFUN (no_access_list_standard_any,
        "Specify packets to forward\n"
        "Any source host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, "0.0.0.0",
 			   "255.255.255.255", NULL, NULL, 0, 0);
 }
 
@@ -837,8 +837,8 @@ DEFUN (access_list_extended,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], argv[4], argv[5], 1 ,1);
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[6]->arg, argv[7]->arg, 1 ,1);
 }
 
 DEFUN (access_list_extended_mask_any,
@@ -854,8 +854,8 @@ DEFUN (access_list_extended_mask_any,
        "Source wildcard bits\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], "0.0.0.0",
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[4]->arg,
+			   argv[5]->arg, "0.0.0.0",
 			   "255.255.255.255", 1, 1);
 }
 
@@ -872,9 +872,9 @@ DEFUN (access_list_extended_any_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
-			   "255.255.255.255", argv[2],
-			   argv[3], 1, 1);
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, "0.0.0.0",
+			   "255.255.255.255", argv[5]->arg,
+			   argv[6]->arg, 1, 1);
 }
 
 DEFUN (access_list_extended_any_any,
@@ -889,7 +889,7 @@ DEFUN (access_list_extended_any_any,
        "Any source host\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, "0.0.0.0",
 			   "255.255.255.255", "0.0.0.0",
 			   "255.255.255.255", 1, 1);
 }
@@ -908,8 +908,8 @@ DEFUN (access_list_extended_mask_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], argv[4],
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[7]->arg,
 			   "0.0.0.0", 1, 1);
 }
 
@@ -927,9 +927,9 @@ DEFUN (access_list_extended_host_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   "0.0.0.0", argv[3],
-			   argv[4], 1, 1);
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[5]->arg,
+			   "0.0.0.0", argv[6]->arg,
+			   argv[7]->arg, 1, 1);
 }
 
 DEFUN (access_list_extended_host_host,
@@ -946,8 +946,8 @@ DEFUN (access_list_extended_host_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   "0.0.0.0", argv[3],
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[5]->arg,
+			   "0.0.0.0", argv[7]->arg,
 			   "0.0.0.0", 1, 1);
 }
 
@@ -964,8 +964,8 @@ DEFUN (access_list_extended_any_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
-			   "255.255.255.255", argv[2],
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, "0.0.0.0",
+			   "255.255.255.255", argv[6]->arg,
 			   "0.0.0.0", 1, 1);
 }
 
@@ -982,7 +982,7 @@ DEFUN (access_list_extended_host_any,
        "Source address\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
+  return filter_set_cisco (vty, argv[1]->arg, argv[2]->arg, argv[5]->arg,
 			   "0.0.0.0", "0.0.0.0",
 			   "255.255.255.255", 1, 1);
 }
@@ -1002,8 +1002,8 @@ DEFUN (no_access_list_extended,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], argv[4], argv[5], 1, 0);
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[5]->arg,
+			   argv[6]->arg, argv[7]->arg, argv[8]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_mask_any,
@@ -1020,8 +1020,8 @@ DEFUN (no_access_list_extended_mask_any,
        "Source wildcard bits\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], "0.0.0.0",
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[5]->arg,
+			   argv[6]->arg, "0.0.0.0",
 			   "255.255.255.255", 1, 0);
 }
 
@@ -1039,9 +1039,9 @@ DEFUN (no_access_list_extended_any_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
-			   "255.255.255.255", argv[2],
-			   argv[3], 1, 0);
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, "0.0.0.0",
+			   "255.255.255.255", argv[6]->arg,
+			   argv[7]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_any_any,
@@ -1057,7 +1057,7 @@ DEFUN (no_access_list_extended_any_any,
        "Any source host\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, "0.0.0.0",
 			   "255.255.255.255", "0.0.0.0",
 			   "255.255.255.255", 1, 0);
 }
@@ -1077,8 +1077,8 @@ DEFUN (no_access_list_extended_mask_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   argv[3], argv[4],
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[5]->arg,
+			   argv[6]->arg, argv[8]->arg,
 			   "0.0.0.0", 1, 0);
 }
 
@@ -1097,9 +1097,9 @@ DEFUN (no_access_list_extended_host_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   "0.0.0.0", argv[3],
-			   argv[4], 1, 0);
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[6]->arg,
+			   "0.0.0.0", argv[7]->arg,
+			   argv[8]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_host_host,
@@ -1117,8 +1117,8 @@ DEFUN (no_access_list_extended_host_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
-			   "0.0.0.0", argv[3],
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[6]->arg,
+			   "0.0.0.0", argv[8]->arg,
 			   "0.0.0.0", 1, 0);
 }
 
@@ -1136,8 +1136,8 @@ DEFUN (no_access_list_extended_any_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], "0.0.0.0",
-			   "255.255.255.255", argv[2],
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, "0.0.0.0",
+			   "255.255.255.255", argv[7]->arg,
 			   "0.0.0.0", 1, 0);
 }
 
@@ -1155,7 +1155,7 @@ DEFUN (no_access_list_extended_host_any,
        "Source address\n"
        "Any destination host\n")
 {
-  return filter_set_cisco (vty, argv[0], argv[1], argv[2],
+  return filter_set_cisco (vty, argv[2]->arg, argv[3]->arg, argv[6]->arg,
 			   "0.0.0.0", "0.0.0.0",
 			   "255.255.255.255", 1, 0);
 }
@@ -1251,7 +1251,7 @@ DEFUN (access_list,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, argv[2], 0, 1);
+  return filter_set_zebra (vty, argv[1]->arg, argv[2]->arg, AFI_IP, argv[3]->arg, 0, 1);
 }
 
 DEFUN (access_list_exact,
@@ -1264,7 +1264,7 @@ DEFUN (access_list_exact,
        "Prefix to match. e.g. 10.0.0.0/8\n"
        "Exact match of the prefixes\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, argv[2], 1, 1);
+  return filter_set_zebra (vty, argv[1]->arg, argv[2]->arg, AFI_IP, argv[3]->arg, 1, 1);
 }
 
 DEFUN (access_list_any,
@@ -1276,7 +1276,7 @@ DEFUN (access_list_any,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, "0.0.0.0/0", 0, 1);
+  return filter_set_zebra (vty, argv[1]->arg, argv[2]->arg, AFI_IP, "0.0.0.0/0", 0, 1);
 }
 
 DEFUN (no_access_list,
@@ -1289,7 +1289,7 @@ DEFUN (no_access_list,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, argv[2], 0, 0);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP, argv[4]->arg, 0, 0);
 }
 
 DEFUN (no_access_list_exact,
@@ -1303,7 +1303,7 @@ DEFUN (no_access_list_exact,
        "Prefix to match. e.g. 10.0.0.0/8\n"
        "Exact match of the prefixes\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, argv[2], 1, 0);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP, argv[4]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_any,
@@ -1316,7 +1316,7 @@ DEFUN (no_access_list_any,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP, "0.0.0.0/0", 0, 0);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP, "0.0.0.0/0", 0, 0);
 }
 
 DEFUN (no_access_list_all,
@@ -1334,10 +1334,10 @@ DEFUN (no_access_list_all,
   struct access_master *master;
 
   /* Looking up access_list. */
-  access = access_list_lookup (AFI_IP, argv[0]);
+  access = access_list_lookup (AFI_IP, argv[2]->arg);
   if (access == NULL)
     {
-      vty_out (vty, "%% access-list %s doesn't exist%s", argv[0],
+      vty_out (vty, "%% access-list %s doesn't exist%s", argv[2]->arg,
 	       VTY_NEWLINE);
       return CMD_WARNING;
     }
@@ -1369,7 +1369,7 @@ DEFUN (access_list_remark,
 {
   struct access_list *access;
 
-  access = access_list_get (AFI_IP, argv[0]);
+  access = access_list_get (AFI_IP, argv[1]->arg);
 
   if (access->remark)
     {
@@ -1393,7 +1393,7 @@ DEFUN (no_access_list_remark,
        "IP zebra access-list\n"
        "Access list entry comment\n")
 {
-  return vty_access_list_remark_unset (vty, AFI_IP, argv[0]);
+  return vty_access_list_remark_unset (vty, AFI_IP, argv[2]->arg);
 }
 	
 ALIAS (no_access_list_remark,
@@ -1420,7 +1420,7 @@ DEFUN (ipv6_access_list,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 3ffe:506::/32\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, argv[2], 0, 1);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP6, argv[4]->arg, 0, 1);
 }
 
 DEFUN (ipv6_access_list_exact,
@@ -1434,7 +1434,7 @@ DEFUN (ipv6_access_list_exact,
        "Prefix to match. e.g. 3ffe:506::/32\n"
        "Exact match of the prefixes\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, argv[2], 1, 1);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP6, argv[4]->arg, 1, 1);
 }
 
 DEFUN (ipv6_access_list_any,
@@ -1447,7 +1447,7 @@ DEFUN (ipv6_access_list_any,
        "Specify packets to forward\n"
        "Any prefixi to match\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, "::/0", 0, 1);
+  return filter_set_zebra (vty, argv[2]->arg, argv[3]->arg, AFI_IP6, "::/0", 0, 1);
 }
 
 DEFUN (no_ipv6_access_list,
@@ -1461,7 +1461,7 @@ DEFUN (no_ipv6_access_list,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 3ffe:506::/32\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, argv[2], 0, 0);
+  return filter_set_zebra (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, argv[5]->arg, 0, 0);
 }
 
 DEFUN (no_ipv6_access_list_exact,
@@ -1476,7 +1476,7 @@ DEFUN (no_ipv6_access_list_exact,
        "Prefix to match. e.g. 3ffe:506::/32\n"
        "Exact match of the prefixes\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, argv[2], 1, 0);
+  return filter_set_zebra (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, argv[5]->arg, 1, 0);
 }
 
 DEFUN (no_ipv6_access_list_any,
@@ -1490,7 +1490,7 @@ DEFUN (no_ipv6_access_list_any,
        "Specify packets to forward\n"
        "Any prefixi to match\n")
 {
-  return filter_set_zebra (vty, argv[0], argv[1], AFI_IP6, "::/0", 0, 0);
+  return filter_set_zebra (vty, argv[3]->arg, argv[4]->arg, AFI_IP6, "::/0", 0, 0);
 }
 
 
@@ -1506,10 +1506,10 @@ DEFUN (no_ipv6_access_list_all,
   struct access_master *master;
 
   /* Looking up access_list. */
-  access = access_list_lookup (AFI_IP6, argv[0]);
+  access = access_list_lookup (AFI_IP6, argv[3]->arg);
   if (access == NULL)
     {
-      vty_out (vty, "%% access-list %s doesn't exist%s", argv[0],
+      vty_out (vty, "%% access-list %s doesn't exist%s", argv[3]->arg,
 	       VTY_NEWLINE);
       return CMD_WARNING;
     }
@@ -1538,7 +1538,7 @@ DEFUN (ipv6_access_list_remark,
 {
   struct access_list *access;
 
-  access = access_list_get (AFI_IP6, argv[0]);
+  access = access_list_get (AFI_IP6, argv[2]->arg);
 
   if (access->remark)
     {
@@ -1559,7 +1559,7 @@ DEFUN (no_ipv6_access_list_remark,
        "IPv6 zebra access-list\n"
        "Access list entry comment\n")
 {
-  return vty_access_list_remark_unset (vty, AFI_IP6, argv[0]);
+  return vty_access_list_remark_unset (vty, AFI_IP6, argv[3]->arg);
 }
 	
 ALIAS (no_ipv6_access_list_remark,
@@ -1705,7 +1705,7 @@ DEFUN (show_ip_access_list_name,
        "IP extended access list (expanded range)\n"
        "IP zebra access-list\n")
 {
-  return filter_show (vty, argv[0], AFI_IP);
+  return filter_show (vty, argv[3]->arg, AFI_IP);
 }
 
 #ifdef HAVE_IPV6
@@ -1727,7 +1727,7 @@ DEFUN (show_ipv6_access_list_name,
        "List IPv6 access lists\n"
        "IPv6 zebra access-list\n")
 {
-  return filter_show (vty, argv[0], AFI_IP6);
+  return filter_show (vty, argv[3]->arg, AFI_IP6);
 }
 #endif /* HAVE_IPV6 */
 
diff --git a/lib/if_rmap.c b/lib/if_rmap.c
index 736f2e237d..0e1199f21a 100644
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@ -220,9 +220,9 @@ DEFUN (if_rmap,
 {
   enum if_rmap_type type;
 
-  if (strncmp (argv[1], "i", 1) == 0)
+  if (strncmp (argv[2]->arg, "i", 1) == 0)
     type = IF_RMAP_IN;
-  else if (strncmp (argv[1], "o", 1) == 0)
+  else if (strncmp (argv[2]->arg, "o", 1) == 0)
     type = IF_RMAP_OUT;
   else
     {
@@ -230,7 +230,7 @@ DEFUN (if_rmap,
       return CMD_WARNING;
     }
 
-  if_rmap_set (argv[2], type, argv[0]);
+  if_rmap_set (argv[3]->arg, type, argv[1]->arg);
 
   return CMD_SUCCESS;
 }      
@@ -257,9 +257,9 @@ DEFUN (no_if_rmap,
   int ret;
   enum if_rmap_type type;
 
-  if (strncmp (argv[1], "i", 1) == 0)
+  if (strncmp (argv[3]->arg, "i", 1) == 0)
     type = IF_RMAP_IN;
-  else if (strncmp (argv[1], "o", 1) == 0)
+  else if (strncmp (argv[3]->arg, "o", 1) == 0)
     type = IF_RMAP_OUT;
   else
     {
@@ -267,7 +267,7 @@ DEFUN (no_if_rmap,
       return CMD_WARNING;
     }
 
-  ret = if_rmap_unset (argv[2], type, argv[0]);
+  ret = if_rmap_unset (argv[4]->arg, type, argv[2]->arg);
   if (! ret)
     {
       vty_out (vty, "route-map doesn't exist%s", VTY_NEWLINE);
diff --git a/lib/keychain.c b/lib/keychain.c
index ac2083cf4b..1997496d34 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -239,7 +239,7 @@ DEFUN (key_chain,
 {
   struct keychain *keychain;
 
-  keychain = keychain_get (argv[0]);
+  keychain = keychain_get (argv[2]->arg);
   vty->index = keychain;
   vty->node = KEYCHAIN_NODE;
 
@@ -256,11 +256,11 @@ DEFUN (no_key_chain,
 {
   struct keychain *keychain;
 
-  keychain = keychain_lookup (argv[0]);
+  keychain = keychain_lookup (argv[3]->arg);
 
   if (! keychain)
     {
-      vty_out (vty, "Can't find keychain %s%s", argv[0], VTY_NEWLINE);
+      vty_out (vty, "Can't find keychain %s%s", argv[3]->arg, VTY_NEWLINE);
       return CMD_WARNING;
     }
 
@@ -281,7 +281,7 @@ DEFUN (key,
 
   keychain = vty->index;
 
-  VTY_GET_INTEGER ("key identifier", index, argv[0]);
+  VTY_GET_INTEGER ("key identifier", index, argv[1]->arg);
   key = key_get (keychain, index);
   vty->index_sub = key;
   vty->node = KEYCHAIN_KEY_NODE;
@@ -302,7 +302,7 @@ DEFUN (no_key,
   
   keychain = vty->index;
 
-  VTY_GET_INTEGER ("key identifier", index, argv[0]);
+  VTY_GET_INTEGER ("key identifier", index, argv[2]->arg);
   key = key_lookup (keychain, index);
   if (! key)
     {
@@ -329,7 +329,7 @@ DEFUN (key_string,
 
   if (key->string)
     XFREE(MTYPE_KEY, key->string);
-  key->string = XSTRDUP(MTYPE_KEY, argv[0]);
+  key->string = XSTRDUP(MTYPE_KEY, argv[1]->arg);
 
   return CMD_SUCCESS;
 }
@@ -556,8 +556,8 @@ DEFUN (accept_lifetime_day_month_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->accept, argv[0], argv[1], argv[2],
-			   argv[3], argv[4], argv[5], argv[6], argv[7]);
+  return key_lifetime_set (vty, &key->accept, argv[1]->arg, argv[2]->arg, argv[3]->arg,
+			   argv[4]->arg, argv[5]->arg, argv[6]->arg, argv[7]->arg, argv[8]->arg);
 }
 
 DEFUN (accept_lifetime_day_month_month_day,
@@ -577,8 +577,8 @@ DEFUN (accept_lifetime_day_month_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->accept, argv[0], argv[1], argv[2],
-			   argv[3], argv[4], argv[6], argv[5], argv[7]);
+  return key_lifetime_set (vty, &key->accept, argv[1]->arg, argv[2]->arg, argv[3]->arg,
+			   argv[4]->arg, argv[5]->arg, argv[7]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (accept_lifetime_month_day_day_month,
@@ -598,8 +598,8 @@ DEFUN (accept_lifetime_month_day_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->accept, argv[0], argv[2], argv[1],
-			   argv[3], argv[4], argv[5], argv[6], argv[7]);
+  return key_lifetime_set (vty, &key->accept, argv[1]->arg, argv[3]->arg, argv[2]->arg,
+			   argv[4]->arg, argv[5]->arg, argv[6]->arg, argv[7]->arg, argv[8]->arg);
 }
 
 DEFUN (accept_lifetime_month_day_month_day,
@@ -619,8 +619,8 @@ DEFUN (accept_lifetime_month_day_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->accept, argv[0], argv[2], argv[1],
-			   argv[3], argv[4], argv[6], argv[5], argv[7]);
+  return key_lifetime_set (vty, &key->accept, argv[1]->arg, argv[3]->arg, argv[2]->arg,
+			   argv[4]->arg, argv[5]->arg, argv[7]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (accept_lifetime_infinite_day_month,
@@ -637,8 +637,8 @@ DEFUN (accept_lifetime_infinite_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_infinite_set (vty, &key->accept, argv[0], argv[1],
-				    argv[2], argv[3]);
+  return key_lifetime_infinite_set (vty, &key->accept, argv[1]->arg, argv[2]->arg,
+				    argv[3]->arg, argv[4]->arg);
 }
 
 DEFUN (accept_lifetime_infinite_month_day,
@@ -655,8 +655,8 @@ DEFUN (accept_lifetime_infinite_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_infinite_set (vty, &key->accept, argv[0], argv[2],
-				    argv[1], argv[3]);
+  return key_lifetime_infinite_set (vty, &key->accept, argv[1]->arg, argv[3]->arg,
+				    argv[2]->arg, argv[4]->arg);
 }
 
 DEFUN (accept_lifetime_duration_day_month,
@@ -674,8 +674,8 @@ DEFUN (accept_lifetime_duration_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_duration_set (vty, &key->accept, argv[0], argv[1],
-				    argv[2], argv[3], argv[4]);
+  return key_lifetime_duration_set (vty, &key->accept, argv[1]->arg, argv[2]->arg,
+				    argv[3]->arg, argv[4]->arg, argv[6]->arg);
 }
 
 DEFUN (accept_lifetime_duration_month_day,
@@ -693,8 +693,8 @@ DEFUN (accept_lifetime_duration_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_duration_set (vty, &key->accept, argv[0], argv[2],
-				    argv[1], argv[3], argv[4]);
+  return key_lifetime_duration_set (vty, &key->accept, argv[1]->arg, argv[3]->arg,
+				    argv[2]->arg, argv[4]->arg, argv[6]->arg);
 }
 
 DEFUN (send_lifetime_day_month_day_month,
@@ -714,8 +714,8 @@ DEFUN (send_lifetime_day_month_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->send, argv[0], argv[1], argv[2], argv[3],
-			   argv[4], argv[5], argv[6], argv[7]);
+  return key_lifetime_set (vty, &key->send, argv[1]->arg, argv[2]->arg, argv[3]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[6]->arg, argv[7]->arg, argv[8]->arg);
 }
 
 DEFUN (send_lifetime_day_month_month_day,
@@ -735,8 +735,8 @@ DEFUN (send_lifetime_day_month_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->send, argv[0], argv[1], argv[2], argv[3],
-			   argv[4], argv[6], argv[5], argv[7]);
+  return key_lifetime_set (vty, &key->send, argv[1]->arg, argv[2]->arg, argv[3]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[7]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (send_lifetime_month_day_day_month,
@@ -756,8 +756,8 @@ DEFUN (send_lifetime_month_day_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->send, argv[0], argv[2], argv[1], argv[3],
-			   argv[4], argv[5], argv[6], argv[7]);
+  return key_lifetime_set (vty, &key->send, argv[1]->arg, argv[3]->arg, argv[2]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[6]->arg, argv[7]->arg, argv[8]->arg);
 }
 
 DEFUN (send_lifetime_month_day_month_day,
@@ -777,8 +777,8 @@ DEFUN (send_lifetime_month_day_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_set (vty, &key->send, argv[0], argv[2], argv[1], argv[3],
-			   argv[4], argv[6], argv[5], argv[7]);
+  return key_lifetime_set (vty, &key->send, argv[1]->arg, argv[3]->arg, argv[2]->arg, argv[4]->arg,
+			   argv[5]->arg, argv[7]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (send_lifetime_infinite_day_month,
@@ -795,8 +795,8 @@ DEFUN (send_lifetime_infinite_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_infinite_set (vty, &key->send, argv[0], argv[1], argv[2],
-				    argv[3]);
+  return key_lifetime_infinite_set (vty, &key->send, argv[1]->arg, argv[2]->arg, argv[3]->arg,
+				    argv[4]->arg);
 }
 
 DEFUN (send_lifetime_infinite_month_day,
@@ -813,8 +813,8 @@ DEFUN (send_lifetime_infinite_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_infinite_set (vty, &key->send, argv[0], argv[2], argv[1],
-				    argv[3]);
+  return key_lifetime_infinite_set (vty, &key->send, argv[1]->arg, argv[3]->arg, argv[2]->arg,
+				    argv[4]->arg);
 }
 
 DEFUN (send_lifetime_duration_day_month,
@@ -832,8 +832,8 @@ DEFUN (send_lifetime_duration_day_month,
 
   key = vty->index_sub;
 
-  return key_lifetime_duration_set (vty, &key->send, argv[0], argv[1], argv[2],
-				    argv[3], argv[4]);
+  return key_lifetime_duration_set (vty, &key->send, argv[1]->arg, argv[2]->arg, argv[3]->arg,
+				    argv[4]->arg, argv[6]->arg);
 }
 
 DEFUN (send_lifetime_duration_month_day,
@@ -851,8 +851,8 @@ DEFUN (send_lifetime_duration_month_day,
 
   key = vty->index_sub;
 
-  return key_lifetime_duration_set (vty, &key->send, argv[0], argv[2], argv[1],
-				    argv[3], argv[4]);
+  return key_lifetime_duration_set (vty, &key->send, argv[1]->arg, argv[3]->arg, argv[2]->arg,
+				    argv[4]->arg, argv[6]->arg);
 }
 
 static struct cmd_node keychain_node =
diff --git a/lib/plist.c b/lib/plist.c
index eedb830c1a..3de92887bf 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -20,7 +20,6 @@
  */
 
 #include <zebra.h>
-#include "lib/json.h"
 
 #include "prefix.h"
 #include "command.h"
@@ -31,6 +30,7 @@
 #include "stream.h"
 #include "log.h"
 #include "routemap.h"
+#include "lib/json.h"
 
 #include "plist_int.h"
 
@@ -1415,8 +1415,8 @@ DEFUN (ip_prefix_list,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, 
-				  argv[1], argv[2], NULL, NULL);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, NULL, 
+				  argv[3]->arg, argv[4]->arg, NULL, NULL);
 }
 
 DEFUN (ip_prefix_list_ge,
@@ -1431,8 +1431,8 @@ DEFUN (ip_prefix_list_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], 
-				 argv[2], argv[3], NULL);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, NULL, argv[3]->arg, 
+				 argv[4]->arg, argv[6]->arg, NULL);
 }
 
 DEFUN (ip_prefix_list_ge_le,
@@ -1449,8 +1449,8 @@ DEFUN (ip_prefix_list_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1], 
-				  argv[2], argv[3], argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, NULL, argv[3]->arg, 
+				  argv[4]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (ip_prefix_list_le,
@@ -1465,8 +1465,8 @@ DEFUN (ip_prefix_list_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1],
-				  argv[2], NULL, argv[3]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, NULL, argv[3]->arg,
+				  argv[4]->arg, NULL, argv[6]->arg);
 }
 
 DEFUN (ip_prefix_list_le_ge,
@@ -1483,8 +1483,8 @@ DEFUN (ip_prefix_list_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], NULL, argv[1],
-				  argv[2], argv[4], argv[3]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, NULL, argv[3]->arg,
+				  argv[4]->arg, argv[8]->arg, argv[6]->arg);
 }
 
 DEFUN (ip_prefix_list_seq,
@@ -1500,8 +1500,8 @@ DEFUN (ip_prefix_list_seq,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "Any prefix match. Same as \"0.0.0.0/0 le 32\"\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2],
-				  argv[3], NULL, NULL);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, NULL, NULL);
 }
 
 DEFUN (ip_prefix_list_seq_ge,
@@ -1518,8 +1518,8 @@ DEFUN (ip_prefix_list_seq_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2],
-				  argv[3], argv[4], NULL);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[8]->arg, NULL);
 }
 
 DEFUN (ip_prefix_list_seq_ge_le,
@@ -1538,8 +1538,8 @@ DEFUN (ip_prefix_list_seq_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2],
-				  argv[3], argv[4], argv[5]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[8]->arg, argv[10]->arg);
 }
 
 DEFUN (ip_prefix_list_seq_le,
@@ -1556,8 +1556,8 @@ DEFUN (ip_prefix_list_seq_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2],
-				  argv[3], NULL, argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, NULL, argv[8]->arg);
 }
 
 DEFUN (ip_prefix_list_seq_le_ge,
@@ -1576,8 +1576,8 @@ DEFUN (ip_prefix_list_seq_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP, argv[0], argv[1], argv[2],
-				  argv[3], argv[5], argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[10]->arg, argv[8]->arg);
 }
 
 DEFUN (no_ip_prefix_list,
@@ -1588,7 +1588,7 @@ DEFUN (no_ip_prefix_list,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, NULL,
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, NULL,
 				    NULL, NULL, NULL);
 }
 
@@ -1604,8 +1604,8 @@ DEFUN (no_ip_prefix_list_prefix,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1],
-				    argv[2], NULL, NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, NULL, NULL);
 }
 
 DEFUN (no_ip_prefix_list_ge,
@@ -1621,8 +1621,8 @@ DEFUN (no_ip_prefix_list_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1],
-				    argv[2], argv[3], NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[7]->arg, NULL);
 }
 
 DEFUN (no_ip_prefix_list_ge_le,
@@ -1640,8 +1640,8 @@ DEFUN (no_ip_prefix_list_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1],
-				    argv[2], argv[3], argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[7]->arg, argv[9]->arg);
 }
 
 DEFUN (no_ip_prefix_list_le,
@@ -1657,8 +1657,8 @@ DEFUN (no_ip_prefix_list_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1],
-				    argv[2], NULL, argv[3]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, NULL, argv[7]->arg);
 }
 
 DEFUN (no_ip_prefix_list_le_ge,
@@ -1676,8 +1676,8 @@ DEFUN (no_ip_prefix_list_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], NULL, argv[1],
-				    argv[2], argv[4], argv[3]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[9]->arg, argv[7]->arg);
 }
 
 DEFUN (no_ip_prefix_list_seq,
@@ -1694,8 +1694,8 @@ DEFUN (no_ip_prefix_list_seq,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "Any prefix match.  Same as \"0.0.0.0/0 le 32\"\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2],
-				    argv[3], NULL, NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, NULL, NULL);
 }
 
 DEFUN (no_ip_prefix_list_seq_ge,
@@ -1713,8 +1713,8 @@ DEFUN (no_ip_prefix_list_seq_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2],
-				    argv[3], argv[4], NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[9]->arg, NULL);
 }
 
 DEFUN (no_ip_prefix_list_seq_ge_le,
@@ -1734,8 +1734,8 @@ DEFUN (no_ip_prefix_list_seq_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2],
-				    argv[3], argv[4], argv[5]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[9]->arg, argv[11]->arg);
 }
 
 DEFUN (no_ip_prefix_list_seq_le,
@@ -1753,8 +1753,8 @@ DEFUN (no_ip_prefix_list_seq_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2],
-				    argv[3], NULL, argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, NULL, argv[9]->arg);
 }
 
 DEFUN (no_ip_prefix_list_seq_le_ge,
@@ -1774,8 +1774,8 @@ DEFUN (no_ip_prefix_list_seq_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP, argv[0], argv[1], argv[2],
-				    argv[3], argv[5], argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[11]->arg, argv[9]->arg);
 }
 
 DEFUN (ip_prefix_list_sequence_number,
@@ -1812,7 +1812,7 @@ DEFUN (ip_prefix_list_description,
 {
   struct prefix_list *plist;
 
-  plist = prefix_list_get (AFI_IP, 0, argv[0]);
+  plist = prefix_list_get (AFI_IP, 0, argv[2]->arg);
   
   if (plist->desc)
     {
@@ -1833,7 +1833,7 @@ DEFUN (no_ip_prefix_list_description,
        "Name of a prefix list\n"
        "Prefix-list specific description\n")
 {
-  return vty_prefix_list_desc_unset (vty, AFI_IP, argv[0]);
+  return vty_prefix_list_desc_unset (vty, AFI_IP, argv[3]->arg);
 }
 
 ALIAS (no_ip_prefix_list_description,
@@ -1864,7 +1864,7 @@ DEFUN (show_ip_prefix_list_name,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, normal_display);
+  return vty_show_prefix_list (vty, AFI_IP, argv[3]->arg, NULL, normal_display);
 }
 
 DEFUN (show_ip_prefix_list_name_seq,
@@ -1877,7 +1877,7 @@ DEFUN (show_ip_prefix_list_name_seq,
        "sequence number of an entry\n"
        "Sequence number\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP, argv[0], argv[1], sequential_display);
+  return vty_show_prefix_list (vty, AFI_IP, argv[3]->arg, argv[5]->arg, sequential_display);
 }
 
 DEFUN (show_ip_prefix_list_prefix,
@@ -1889,7 +1889,7 @@ DEFUN (show_ip_prefix_list_prefix,
        "Name of a prefix list\n"
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], normal_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[3]->arg, argv[4]->arg, normal_display);
 }
 
 DEFUN (show_ip_prefix_list_prefix_longer,
@@ -1902,7 +1902,7 @@ DEFUN (show_ip_prefix_list_prefix_longer,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "Lookup longer prefix\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], longer_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[3]->arg, argv[4]->arg, longer_display);
 }
 
 DEFUN (show_ip_prefix_list_prefix_first_match,
@@ -1915,7 +1915,7 @@ DEFUN (show_ip_prefix_list_prefix_first_match,
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n"
        "First matched prefix\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[0], argv[1], first_match_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP, argv[3]->arg, argv[4]->arg, first_match_display);
 }
 
 DEFUN (show_ip_prefix_list_summary,
@@ -1938,7 +1938,7 @@ DEFUN (show_ip_prefix_list_summary_name,
        "Summary of prefix lists\n"
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, summary_display);
+  return vty_show_prefix_list (vty, AFI_IP, argv[4]->arg, NULL, summary_display);
 }
 
 
@@ -1962,7 +1962,7 @@ DEFUN (show_ip_prefix_list_detail_name,
        "Detail of prefix lists\n"
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP, argv[0], NULL, detail_display);
+  return vty_show_prefix_list (vty, AFI_IP, argv[4]->arg, NULL, detail_display);
 }
 
 DEFUN (clear_ip_prefix_list,
@@ -1983,7 +1983,7 @@ DEFUN (clear_ip_prefix_list_name,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_clear_prefix_list (vty, AFI_IP, argv[0], NULL);
+  return vty_clear_prefix_list (vty, AFI_IP, argv[3]->arg, NULL);
 }
 
 DEFUN (clear_ip_prefix_list_name_prefix,
@@ -1995,7 +1995,7 @@ DEFUN (clear_ip_prefix_list_name_prefix,
        "Name of a prefix list\n"
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 {
-  return vty_clear_prefix_list (vty, AFI_IP, argv[0], argv[1]);
+  return vty_clear_prefix_list (vty, AFI_IP, argv[3]->arg, argv[4]->arg);
 }
 
 #ifdef HAVE_IPV6
@@ -2010,8 +2010,8 @@ DEFUN (ipv6_prefix_list,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "Any prefix match.  Same as \"::0/0 le 128\"\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, 
-				  argv[1], argv[2], NULL, NULL);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, NULL, 
+				  argv[3]->arg, argv[4]->arg, NULL, NULL);
 }
 
 DEFUN (ipv6_prefix_list_ge,
@@ -2026,8 +2026,8 @@ DEFUN (ipv6_prefix_list_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], 
-				 argv[2], argv[3], NULL);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, NULL, argv[3]->arg, 
+				 argv[4]->arg, argv[6]->arg, NULL);
 }
 
 DEFUN (ipv6_prefix_list_ge_le,
@@ -2045,8 +2045,8 @@ DEFUN (ipv6_prefix_list_ge_le,
        "Maximum prefix length\n")
 
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1], 
-				  argv[2], argv[3], argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, NULL, argv[3]->arg, 
+				  argv[4]->arg, argv[6]->arg, argv[8]->arg);
 }
 
 DEFUN (ipv6_prefix_list_le,
@@ -2061,8 +2061,8 @@ DEFUN (ipv6_prefix_list_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1],
-				  argv[2], NULL, argv[3]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, NULL, argv[3]->arg,
+				  argv[4]->arg, NULL, argv[6]->arg);
 }
 
 DEFUN (ipv6_prefix_list_le_ge,
@@ -2079,8 +2079,8 @@ DEFUN (ipv6_prefix_list_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], NULL, argv[1],
-				  argv[2], argv[4], argv[3]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, NULL, argv[3]->arg,
+				  argv[4]->arg, argv[8]->arg, argv[6]->arg);
 }
 
 DEFUN (ipv6_prefix_list_seq,
@@ -2096,8 +2096,8 @@ DEFUN (ipv6_prefix_list_seq,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "Any prefix match.  Same as \"::0/0 le 128\"\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				  argv[3], NULL, NULL);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, NULL, NULL);
 }
 
 DEFUN (ipv6_prefix_list_seq_ge,
@@ -2114,8 +2114,8 @@ DEFUN (ipv6_prefix_list_seq_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				  argv[3], argv[4], NULL);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[8]->arg, NULL);
 }
 
 DEFUN (ipv6_prefix_list_seq_ge_le,
@@ -2134,8 +2134,8 @@ DEFUN (ipv6_prefix_list_seq_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				  argv[3], argv[4], argv[5]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[8]->arg, argv[10]->arg);
 }
 
 DEFUN (ipv6_prefix_list_seq_le,
@@ -2152,8 +2152,8 @@ DEFUN (ipv6_prefix_list_seq_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				  argv[3], NULL, argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, NULL, argv[8]->arg);
 }
 
 DEFUN (ipv6_prefix_list_seq_le_ge,
@@ -2172,8 +2172,8 @@ DEFUN (ipv6_prefix_list_seq_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_install (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				  argv[3], argv[5], argv[4]);
+  return vty_prefix_list_install (vty, AFI_IP6, argv[2]->arg, argv[4]->arg, argv[5]->arg,
+				  argv[6]->arg, argv[10]->arg, argv[8]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list,
@@ -2184,7 +2184,7 @@ DEFUN (no_ipv6_prefix_list,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, NULL,
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, NULL,
 				    NULL, NULL, NULL);
 }
 
@@ -2200,8 +2200,8 @@ DEFUN (no_ipv6_prefix_list_prefix,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "Any prefix match.  Same as \"::0/0 le 128\"\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1],
-				    argv[2], NULL, NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, NULL, NULL);
 }
 
 DEFUN (no_ipv6_prefix_list_ge,
@@ -2217,8 +2217,8 @@ DEFUN (no_ipv6_prefix_list_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1],
-				    argv[2], argv[3], NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[7]->arg, NULL);
 }
 
 DEFUN (no_ipv6_prefix_list_ge_le,
@@ -2236,8 +2236,8 @@ DEFUN (no_ipv6_prefix_list_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1],
-				    argv[2], argv[3], argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[7]->arg, argv[9]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list_le,
@@ -2253,8 +2253,8 @@ DEFUN (no_ipv6_prefix_list_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1],
-				    argv[2], NULL, argv[3]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, NULL, argv[7]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list_le_ge,
@@ -2272,8 +2272,8 @@ DEFUN (no_ipv6_prefix_list_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], NULL, argv[1],
-				    argv[2], argv[4], argv[3]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, NULL, argv[4]->arg,
+				    argv[5]->arg, argv[9]->arg, argv[7]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list_seq,
@@ -2290,8 +2290,8 @@ DEFUN (no_ipv6_prefix_list_seq,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "Any prefix match.  Same as \"::0/0 le 128\"\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				    argv[3], NULL, NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, NULL, NULL);
 }
 
 DEFUN (no_ipv6_prefix_list_seq_ge,
@@ -2309,8 +2309,8 @@ DEFUN (no_ipv6_prefix_list_seq_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				    argv[3], argv[4], NULL);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[9]->arg, NULL);
 }
 
 DEFUN (no_ipv6_prefix_list_seq_ge_le,
@@ -2330,8 +2330,8 @@ DEFUN (no_ipv6_prefix_list_seq_ge_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				    argv[3], argv[4], argv[5]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[9]->arg, argv[11]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list_seq_le,
@@ -2349,8 +2349,8 @@ DEFUN (no_ipv6_prefix_list_seq_le,
        "Maximum prefix length to be matched\n"
        "Maximum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				    argv[3], NULL, argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, NULL, argv[9]->arg);
 }
 
 DEFUN (no_ipv6_prefix_list_seq_le_ge,
@@ -2370,8 +2370,8 @@ DEFUN (no_ipv6_prefix_list_seq_le_ge,
        "Minimum prefix length to be matched\n"
        "Minimum prefix length\n")
 {
-  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[0], argv[1], argv[2],
-				    argv[3], argv[5], argv[4]);
+  return vty_prefix_list_uninstall (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, argv[6]->arg,
+				    argv[7]->arg, argv[11]->arg, argv[9]->arg);
 }
 
 DEFUN (ipv6_prefix_list_sequence_number,
@@ -2408,7 +2408,7 @@ DEFUN (ipv6_prefix_list_description,
 {
   struct prefix_list *plist;
 
-  plist = prefix_list_get (AFI_IP6, 0, argv[0]);
+  plist = prefix_list_get (AFI_IP6, 0, argv[2]->arg);
   
   if (plist->desc)
     {
@@ -2429,7 +2429,7 @@ DEFUN (no_ipv6_prefix_list_description,
        "Name of a prefix list\n"
        "Prefix-list specific description\n")
 {
-  return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[0]);
+  return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[3]->arg);
 }
 
 ALIAS (no_ipv6_prefix_list_description,
@@ -2460,7 +2460,7 @@ DEFUN (show_ipv6_prefix_list_name,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, normal_display);
+  return vty_show_prefix_list (vty, AFI_IP6, argv[3]->arg, NULL, normal_display);
 }
 
 DEFUN (show_ipv6_prefix_list_name_seq,
@@ -2473,7 +2473,7 @@ DEFUN (show_ipv6_prefix_list_name_seq,
        "sequence number of an entry\n"
        "Sequence number\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP6, argv[0], argv[1], sequential_display);
+  return vty_show_prefix_list (vty, AFI_IP6, argv[3]->arg, argv[5]->arg, sequential_display);
 }
 
 DEFUN (show_ipv6_prefix_list_prefix,
@@ -2485,7 +2485,7 @@ DEFUN (show_ipv6_prefix_list_prefix,
        "Name of a prefix list\n"
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], normal_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[3]->arg, argv[4]->arg, normal_display);
 }
 
 DEFUN (show_ipv6_prefix_list_prefix_longer,
@@ -2498,7 +2498,7 @@ DEFUN (show_ipv6_prefix_list_prefix_longer,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "Lookup longer prefix\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], longer_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[3]->arg, argv[4]->arg, longer_display);
 }
 
 DEFUN (show_ipv6_prefix_list_prefix_first_match,
@@ -2511,7 +2511,7 @@ DEFUN (show_ipv6_prefix_list_prefix_first_match,
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n"
        "First matched prefix\n")
 {
-  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[0], argv[1], first_match_display);
+  return vty_show_prefix_list_prefix (vty, AFI_IP6, argv[3]->arg, argv[4]->arg, first_match_display);
 }
 
 DEFUN (show_ipv6_prefix_list_summary,
@@ -2534,7 +2534,7 @@ DEFUN (show_ipv6_prefix_list_summary_name,
        "Summary of prefix lists\n"
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, summary_display);
+  return vty_show_prefix_list (vty, AFI_IP6, argv[4]->arg, NULL, summary_display);
 }
 
 DEFUN (show_ipv6_prefix_list_detail,
@@ -2557,7 +2557,7 @@ DEFUN (show_ipv6_prefix_list_detail_name,
        "Detail of prefix lists\n"
        "Name of a prefix list\n")
 {
-  return vty_show_prefix_list (vty, AFI_IP6, argv[0], NULL, detail_display);
+  return vty_show_prefix_list (vty, AFI_IP6, argv[4]->arg, NULL, detail_display);
 }
 
 DEFUN (clear_ipv6_prefix_list,
@@ -2578,7 +2578,7 @@ DEFUN (clear_ipv6_prefix_list_name,
        PREFIX_LIST_STR
        "Name of a prefix list\n")
 {
-  return vty_clear_prefix_list (vty, AFI_IP6, argv[0], NULL);
+  return vty_clear_prefix_list (vty, AFI_IP6, argv[3]->arg, NULL);
 }
 
 DEFUN (clear_ipv6_prefix_list_name_prefix,
@@ -2590,7 +2590,7 @@ DEFUN (clear_ipv6_prefix_list_name_prefix,
        "Name of a prefix list\n"
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
 {
-  return vty_clear_prefix_list (vty, AFI_IP6, argv[0], argv[1]);
+  return vty_clear_prefix_list (vty, AFI_IP6, argv[3]->arg, argv[4]->arg);
 }
 #endif /* HAVE_IPV6 */
 
diff --git a/tools/argv_translator.py b/tools/argv_translator.py
index 57cc28bbbc..051e284c58 100755
--- a/tools/argv_translator.py
+++ b/tools/argv_translator.py
@@ -31,6 +31,8 @@ def token_is_variable(line_number, token):
                  '.LINE', # where is this defined?
                  'LINE',
                  'BANDWIDTH',
+                 'RMAP_NAME',
+                 'ROUTEMAP_NAME',
                  'IPV6ADDR',
                  'IF_OR_ADDR',
                  'INTERFACE',
@@ -46,6 +48,9 @@ def token_is_variable(line_number, token):
                  'ASN:nn_or_IP-address:nn'): # where is this defined?
         return True
 
+    if token.upper() == token:
+        return True
+
     re_number_range = re.search('^<\d+-\d+>$', token)
     if re_number_range:
         return True