1 files changed, 19 insertions, 19 deletions

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index b84585405..ac297890a 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -930,7 +930,7 @@ DEFUN (ipv6_nd_ra_interval_msec,
   struct zebra_ns *zns;
 
   zns = zvrf->zns;
-  VTY_GET_INTEGER_RANGE ("router advertisement interval", interval, argv[0]->arg, 70, 1800000);
+  VTY_GET_INTEGER_RANGE ("router advertisement interval", interval, argv[0], 70, 1800000);
   if ((zif->rtadv.AdvDefaultLifetime != -1 && interval > (unsigned)zif->rtadv.AdvDefaultLifetime * 1000))
   {
     vty_out (vty, "This ra-interval would conflict with configured ra-lifetime!%s", VTY_NEWLINE);
@@ -965,7 +965,7 @@ DEFUN (ipv6_nd_ra_interval,
   struct zebra_ns *zns;
 
   zns = zvrf->zns;
-  VTY_GET_INTEGER_RANGE ("router advertisement interval", interval, argv[0]->arg, 1, 1800);
+  VTY_GET_INTEGER_RANGE ("router advertisement interval", interval, argv[0], 1, 1800);
   if ((zif->rtadv.AdvDefaultLifetime != -1 && interval > (unsigned)zif->rtadv.AdvDefaultLifetime))
   {
     vty_out (vty, "This ra-interval would conflict with configured ra-lifetime!%s", VTY_NEWLINE);
@@ -1045,7 +1045,7 @@ DEFUN (ipv6_nd_ra_lifetime,
   ifp = (struct interface *) vty->index;
   zif = ifp->info;
 
-  VTY_GET_INTEGER_RANGE ("router lifetime", lifetime, argv[0]->arg, 0, 9000);
+  VTY_GET_INTEGER_RANGE ("router lifetime", lifetime, argv[0], 0, 9000);
 
   /* The value to be placed in the Router Lifetime field
    * of Router Advertisements sent from the interface,
@@ -1100,7 +1100,7 @@ DEFUN (ipv6_nd_reachable_time,
 {
   struct interface *ifp = (struct interface *) vty->index;
   struct zebra_if *zif = ifp->info;
-  VTY_GET_INTEGER_RANGE ("reachable time", zif->rtadv.AdvReachableTime, argv[0]->arg, 1, RTADV_MAX_REACHABLE_TIME);
+  VTY_GET_INTEGER_RANGE ("reachable time", zif->rtadv.AdvReachableTime, argv[0], 1, RTADV_MAX_REACHABLE_TIME);
   return CMD_SUCCESS;
 }
 
@@ -1142,7 +1142,7 @@ DEFUN (ipv6_nd_homeagent_preference,
 {
   struct interface *ifp = (struct interface *) vty->index;
   struct zebra_if *zif = ifp->info;
-  VTY_GET_INTEGER_RANGE ("home agent preference", zif->rtadv.HomeAgentPreference, argv[0]->arg, 0, 65535);
+  VTY_GET_INTEGER_RANGE ("home agent preference", zif->rtadv.HomeAgentPreference, argv[0], 0, 65535);
   return CMD_SUCCESS;
 }
 
@@ -1184,7 +1184,7 @@ DEFUN (ipv6_nd_homeagent_lifetime,
 {
   struct interface *ifp = (struct interface *) vty->index;
   struct zebra_if *zif = ifp->info;
-  VTY_GET_INTEGER_RANGE ("home agent lifetime", zif->rtadv.HomeAgentLifetime, argv[0]->arg, 0, RTADV_MAX_HALIFETIME);
+  VTY_GET_INTEGER_RANGE ("home agent lifetime", zif->rtadv.HomeAgentLifetime, argv[0], 0, RTADV_MAX_HALIFETIME);
   return CMD_SUCCESS;
 }
 
@@ -1390,7 +1390,7 @@ DEFUN (ipv6_nd_prefix,
   ifp = (struct interface *) vty->index;
   zebra_if = ifp->info;
 
-  ret = str2prefix_ipv6 (argv[0]->arg, &rp.prefix);
+  ret = str2prefix_ipv6 (argv[0], &rp.prefix);
   if (!ret)
     {
       vty_out (vty, "Malformed IPv6 prefix%s", VTY_NEWLINE);
@@ -1405,19 +1405,19 @@ DEFUN (ipv6_nd_prefix,
 
   if (argc > 1)
     {
-      if ((isdigit((unsigned char)argv[1]->arg[0]))
-	  || strncmp (argv[1]->arg, "i", 1) == 0)
+      if ((isdigit((unsigned char)argv[1][0]))
+	  || strncmp (argv[1], "i", 1) == 0)
 	{
-	  if ( strncmp (argv[1]->arg, "i", 1) == 0)
+	  if ( strncmp (argv[1], "i", 1) == 0)
 	    rp.AdvValidLifetime = UINT32_MAX;
 	  else
-	    rp.AdvValidLifetime = (u_int32_t) strtoll (argv[1]->arg,
+	    rp.AdvValidLifetime = (u_int32_t) strtoll (argv[1],
 		(char **)NULL, 10);
       
-	  if ( strncmp (argv[2]->arg, "i", 1) == 0)
+	  if ( strncmp (argv[2], "i", 1) == 0)
 	    rp.AdvPreferredLifetime = UINT32_MAX;
 	  else
-	    rp.AdvPreferredLifetime = (u_int32_t) strtoll (argv[2]->arg,
+	    rp.AdvPreferredLifetime = (u_int32_t) strtoll (argv[2],
 		(char **)NULL, 10);
 
 	  if (rp.AdvPreferredLifetime > rp.AdvValidLifetime)
@@ -1431,11 +1431,11 @@ DEFUN (ipv6_nd_prefix,
 	{
 	  for (i = cursor; i < argc; i++)
 	    {
-	      if (strncmp (argv[i]->arg, "of", 2) == 0)
+	      if (strncmp (argv[i], "of", 2) == 0)
 		rp.AdvOnLinkFlag = 0;
-	      if (strncmp (argv[i]->arg, "no", 2) == 0)
+	      if (strncmp (argv[i], "no", 2) == 0)
 		rp.AdvAutonomousFlag = 0;
-	      if (strncmp (argv[i]->arg, "ro", 2) == 0)
+	      if (strncmp (argv[i], "ro", 2) == 0)
 		rp.AdvRouterAddressFlag = 1;
 	    }
 	}
@@ -1619,7 +1619,7 @@ DEFUN (no_ipv6_nd_prefix,
   ifp = (struct interface *) vty->index;
   zebra_if = ifp->info;
 
-  ret = str2prefix_ipv6 (argv[0]->arg, &rp.prefix);
+  ret = str2prefix_ipv6 (argv[0], &rp.prefix);
   if (!ret)
     {
       vty_out (vty, "Malformed IPv6 prefix%s", VTY_NEWLINE);
@@ -1810,7 +1810,7 @@ DEFUN (ipv6_nd_router_preference,
 
   while (0 != rtadv_pref_strs[i])
     {
-      if (strncmp (argv[0]->arg, rtadv_pref_strs[i], 1) == 0)
+      if (strncmp (argv[0], rtadv_pref_strs[i], 1) == 0)
 	{
 	  zif->rtadv.DefaultPreference = i;
 	  return CMD_SUCCESS;
@@ -1861,7 +1861,7 @@ DEFUN (ipv6_nd_mtu,
 {
   struct interface *ifp = (struct interface *) vty->index;
   struct zebra_if *zif = ifp->info;
-  VTY_GET_INTEGER_RANGE ("MTU", zif->rtadv.AdvLinkMTU, argv[0]->arg, 1, 65535);
+  VTY_GET_INTEGER_RANGE ("MTU", zif->rtadv.AdvLinkMTU, argv[0], 1, 65535);
   return CMD_SUCCESS;
 }