Merge pull request #754 from qlyoung/fix-argv-arg

use argv->text where appropriate

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
index 190e947c510eafabeb640b8200f6f081d97a42e1,3c53df10a0b1b74238f29c4b4662b72c97ff0936..01422f392a1656dcd69a1e5b75dc0b9e61021792
--- 1/bgpd/bgp_vty.c
--- 2/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@@ -9838,11 -9759,11 +9735,11 @@@ DEFUN (show_bgp_updgrps_afi_adj_s
    int idx_type = 6;
    uint64_t subgrp_id;
  
 -  VTY_GET_ULL("subgroup-id", subgrp_id, argv[idx_subgroup_id]->arg);
 +  subgrp_id = strtoull(argv[idx_subgroup_id]->arg, NULL, 10);
  
    show_bgp_updgrps_adj_info_aux(vty, NULL, 
-                                 bgp_vty_afi_from_arg(argv[idx_afi]->arg),
-                                 bgp_vty_safi_from_arg(argv[idx_safi]->arg),
+                                 bgp_vty_afi_from_str(argv[idx_afi]->text),
+                                 bgp_vty_safi_from_str(argv[idx_safi]->text),
                                  argv[idx_type]->arg, subgrp_id);
    return CMD_SUCCESS;
  }

diff --cc bgpd/rfapi/bgp_rfapi_cfg.c
Simple merge

diff --cc bgpd/rfapi/rfapi.c
Simple merge

diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc nhrpd/nhrp_vty.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc zebra/zebra_vty.c
Simple merge