proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 06:34:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: use ->text and strmatch where appropriate

Browse Source 
Still need to go fix all the places where we do a 1-char strncmp...

spatch follows
------------------

@asdf@
expression idx;
@@
<...
 strcmp (
- argv[idx]->arg,
+ argv[idx]->text,
  ...)
...>

@depends on asdf@
expression idx;
@@
<...
- !strcmp (argv[idx]->text,
+ strmatch (argv[idx]->text,
           ...)
...>

@depends on asdf@
expression idx;
expression arg;
@@
<...
- strcmp (argv[idx]->text, arg) == 0
+ strmatch (argv[idx]->text, arg)
...>

@depends on asdf@
expression idx;
expression arg;
@@
<...
- strcmp (argv[idx]->text, arg) != 0
+ !strmatch (argv[idx]->text, arg)
...>

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-06-26 18:15:19 +00:00
parent 5ce1d8b118
commit 7e045c3d42
14 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_bfd.c
View File

@ -629,9 +629,9 @@ DEFUN_HIDDEN (neighbor_bfd_type,
if (!peer)
return CMD_WARNING;
if (!strcmp(argv[idx_hop]->arg, "singlehop"))
if (strmatch(argv[idx_hop]->text, "singlehop"))
type = BFD_TYPE_SINGLEHOP;
else if (!strcmp(argv[idx_hop]->arg, "multihop"))
else if (strmatch(argv[idx_hop]->text, "multihop"))
type = BFD_TYPE_MULTIHOP;
else
return CMD_WARNING;

4
bgpd/bgp_dump.c
View File

@ -753,7 +753,7 @@ DEFUN (dump_bgp_all,
const struct bgp_dump_type_map *map = NULL;
for (map = bgp_dump_type_map; map->str; map++)
if (strcmp(argv[idx_dump_routes]->arg, map->str) == 0)
if (strmatch(argv[idx_dump_routes]->text, map->str))
bgp_dump_type = map->type;
switch (bgp_dump_type)
@ -800,7 +800,7 @@ DEFUN (no_dump_bgp_all,
struct bgp_dump *bgp_dump_struct = NULL;
for (map = bgp_dump_type_map; map->str; map++)
if (strcmp(argv[idx_dump_routes]->arg, map->str) == 0)
if (strmatch(argv[idx_dump_routes]->text, map->str))
bgp_dump_type = map->type;
switch (bgp_dump_type)

2
bgpd/bgp_route.c
View File

@ -8867,7 +8867,7 @@ bgp_show_community (struct vty *vty, struct bgp *bgp, int argc,
buffer_putc (b, ' ');
else
{
if ((strcmp (argv[i]->arg, "unicast") == 0) || (strcmp (argv[i]->arg, "multicast") == 0))
if (strmatch(argv[i]->text, "unicast") || strmatch(argv[i]->text, "multicast"))
continue;
first = 1;
}

50
bgpd/rfapi/bgp_rfapi_cfg.c
View File

@ -479,7 +479,7 @@ DEFUN (vnc_defaults_l2rd,
VTY_DECLVAR_CONTEXT(bgp, bgp);
uint8_t value = 0;
if (!strcmp (argv[1]->arg, "auto-vn"))
if (strmatch(argv[1]->text, "auto-vn"))
{
value = 0;
}
@ -539,7 +539,7 @@ DEFUN (vnc_defaults_responselifetime,
if (!h)
return CMD_WARNING;
if (!strcmp (argv[1]->arg, "infinite"))
if (strmatch(argv[1]->text, "infinite"))
{
rspint = RFAPI_INFINITE_LIFETIME;
}
@ -1102,7 +1102,7 @@ DEFUN (vnc_redistribute_lifetime,
vnc_redistribute_prechange (bgp);
if (!strcmp (argv[3]->arg, "infinite"))
if (strmatch(argv[3]->text, "infinite"))
{
bgp->rfapi_cfg->redist_lifetime = RFAPI_INFINITE_LIFETIME;
}
@ -1141,7 +1141,7 @@ DEFUN (vnc_redist_bgpdirect_no_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "bgp-direct"))
if (strmatch(argv[3]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
@ -1150,7 +1150,7 @@ DEFUN (vnc_redist_bgpdirect_no_prefixlist,
route_type = ZEBRA_ROUTE_BGP_DIRECT_EXT;
}
if (!strcmp (argv[4]->arg, "ipv4"))
if (strmatch(argv[4]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1194,7 +1194,7 @@ DEFUN (vnc_redist_bgpdirect_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[2]->arg, "bgp-direct"))
if (strmatch(argv[2]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
@ -1203,7 +1203,7 @@ DEFUN (vnc_redist_bgpdirect_prefixlist,
route_type = ZEBRA_ROUTE_BGP_DIRECT_EXT;
}
if (!strcmp (argv[3]->arg, "ipv4"))
if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1244,7 +1244,7 @@ DEFUN (vnc_redist_bgpdirect_no_routemap,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "bgp-direct"))
if (strmatch(argv[3]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
@ -1284,7 +1284,7 @@ DEFUN (vnc_redist_bgpdirect_routemap,
return CMD_WARNING;
}
if (!strcmp (argv[2]->arg, "bgp-direct"))
if (strmatch(argv[2]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
@ -1337,7 +1337,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "ipv4"))
if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1386,7 +1386,7 @@ DEFUN (vnc_nve_group_redist_bgpdirect_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[2]->arg, "ipv4"))
if (strmatch(argv[2]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1804,7 +1804,7 @@ DEFUN (vnc_nve_group_export_no_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "ipv4"))
if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1816,7 +1816,7 @@ DEFUN (vnc_nve_group_export_no_prefixlist,
if (argv[2]->arg[0] == 'b')
{
if (((argc > 5)
&& !strcmp (argv[5]->arg, rfg->plist_export_bgp_name[afi]))
&& strmatch(argv[5]->text, rfg->plist_export_bgp_name[afi]))
|| (argc <= 5))
{
@ -1831,7 +1831,7 @@ DEFUN (vnc_nve_group_export_no_prefixlist,
else
{
if (((argc > 5)
&& !strcmp (argv[5]->arg, rfg->plist_export_zebra_name[afi]))
&& strmatch(argv[5]->text, rfg->plist_export_zebra_name[afi]))
|| (argc <= 5))
{
if (rfg->plist_export_zebra_name[afi])
@ -1873,7 +1873,7 @@ DEFUN (vnc_nve_group_export_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[2]->arg, "ipv4"))
if (strmatch(argv[2]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -1933,7 +1933,7 @@ DEFUN (vnc_nve_group_export_no_routemap,
if (argv[2]->arg[0] == 'b')
{
if (((argc > 4)
&& !strcmp (argv[4]->arg, rfg->routemap_export_bgp_name))
&& strmatch(argv[4]->text, rfg->routemap_export_bgp_name))
|| (argc <= 4))
{
@ -1949,7 +1949,7 @@ DEFUN (vnc_nve_group_export_no_routemap,
else
{
if (((argc > 4)
&& !strcmp (argv[4]->arg, rfg->routemap_export_zebra_name))
&& strmatch(argv[4]->text, rfg->routemap_export_zebra_name))
|| (argc <= 4))
{
if (rfg->routemap_export_zebra_name)
@ -2032,7 +2032,7 @@ DEFUN (vnc_nve_export_no_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[4]->arg, "ipv4"))
if (strmatch(argv[4]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -2045,7 +2045,7 @@ DEFUN (vnc_nve_export_no_prefixlist,
{
if (((argc > 6)
&& hc->plist_export_bgp_name[afi]
&& !strcmp (argv[6]->arg, hc->plist_export_bgp_name[afi]))
&& strmatch(argv[6]->text, hc->plist_export_bgp_name[afi]))
|| (argc <= 6))
{
@ -2059,7 +2059,7 @@ DEFUN (vnc_nve_export_no_prefixlist,
{
if (((argc > 6)
&& hc->plist_export_zebra_name[afi]
&& !strcmp (argv[6]->arg, hc->plist_export_zebra_name[afi]))
&& strmatch(argv[6]->text, hc->plist_export_zebra_name[afi]))
|| (argc <= 6))
{
@ -2094,7 +2094,7 @@ DEFUN (vnc_nve_export_prefixlist,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "ipv4"))
if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
@ -2145,7 +2145,7 @@ DEFUN (vnc_nve_export_no_routemap,
{
if (((argc > 5)
&& hc->routemap_export_bgp_name
&& !strcmp (argv[5]->arg, hc->routemap_export_bgp_name))
&& strmatch(argv[5]->text, hc->routemap_export_bgp_name))
|| (argc <= 5))
{
@ -2160,7 +2160,7 @@ DEFUN (vnc_nve_export_no_routemap,
{
if (((argc > 5)
&& hc->routemap_export_zebra_name
&& !strcmp (argv[5]->arg, hc->routemap_export_zebra_name))
&& strmatch(argv[5]->text, hc->routemap_export_zebra_name))
|| (argc <= 5))
{
@ -3050,7 +3050,7 @@ DEFUN (vnc_nve_group_l2rd,
return CMD_WARNING;
}
if (!strcmp (argv[1]->arg, "auto:vn"))
if (strmatch(argv[1]->text, "auto:vn"))
{
rfg->l2rd = 0;
}
@ -3199,7 +3199,7 @@ DEFUN (vnc_nve_group_responselifetime,
return CMD_WARNING;
}
if (!strcmp (argv[1]->arg, "infinite"))
if (strmatch(argv[1]->text, "infinite"))
{
rspint = RFAPI_INFINITE_LIFETIME;
}

6
bgpd/rfapi/rfapi.c
View File

@ -3333,7 +3333,7 @@ DEFUN (debug_rfapi_register_vn_un,
}
rfapiQprefix2Rprefix (&pfx, &hpfx);
if (!strcmp (argv[10]->arg, "infinite"))
if (strmatch(argv[10]->text, "infinite"))
{
lifetime = RFAPI_INFINITE_LIFETIME;
}
@ -3422,7 +3422,7 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
}
rfapiQprefix2Rprefix (&pfx, &hpfx);
if (!strcmp (argv[10]->arg, "infinite"))
if (strmatch(argv[10]->text, "infinite"))
{
lifetime = RFAPI_INFINITE_LIFETIME;
}
@ -3932,7 +3932,7 @@ DEFUN (debug_rfapi_response_omit_self,
return CMD_WARNING;
}
if (!strcmp (argv[3]->arg, "on"))
if (strmatch(argv[3]->text, "on"))
SET_FLAG (bgp->rfapi_cfg->flags, BGP_VNC_CONFIG_FILTER_SELF_FROM_RSP);
else
UNSET_FLAG (bgp->rfapi_cfg->flags, BGP_VNC_CONFIG_FILTER_SELF_FROM_RSP);

4
bgpd/rfapi/rfapi_vty.c
View File

@ -2236,7 +2236,7 @@ register_add (
for (; argc; --argc, ++argv)
{
if (!strcmp (argv[0]->arg, "local-next-hop"))
if (strmatch(argv[0]->text, "local-next-hop"))
{
if (arg_lnh)
{
@ -2253,7 +2253,7 @@ register_add (
++argv, --argc;
arg_lnh = argv[0]->arg;
}
if (!strcmp (argv[0]->arg, "local-cost"))
if (strmatch(argv[0]->text, "local-cost"))
{
if (arg_lnh_cost)
{

6
bgpd/rfapi/vnc_debug.c
View File

@ -69,7 +69,7 @@ DEFUN (debug_bgp_vnc,
for (i = 0; i < (sizeof(vncdebug) / sizeof(struct vnc_debug)); ++i)
{
if (!strcmp(argv[3]->arg, vncdebug[i].name))
if (strmatch(argv[3]->text, vncdebug[i].name))
{
if (vty->node == CONFIG_NODE)
{
@ -104,11 +104,11 @@ DEFUN (no_debug_bgp_vnc,
{
size_t i;
if (!strcmp(argv[0]->arg, "no"))
if (strmatch(argv[0]->text, "no"))
argc--, argv++;
for (i = 0; i < (sizeof(vncdebug) / sizeof(struct vnc_debug)); ++i)
{
if (!strcmp(argv[3]->arg, vncdebug[i].name))
if (strmatch(argv[3]->text, vncdebug[i].name))
{
if (vty->node == CONFIG_NODE)
{

2
isisd/isis_spf.c
View File

@ -1386,7 +1386,7 @@ DEFUN (show_isis_topology,
if (argc < 4)
levels = ISIS_LEVEL1|ISIS_LEVEL2;
else if (!strcmp(argv[3]->arg, "level-1"))
else if (strmatch(argv[3]->text, "level-1"))
levels = ISIS_LEVEL1;
else
levels = ISIS_LEVEL2;

4
lib/command.c
View File

@ -1534,8 +1534,8 @@ DEFUN (config_write,
struct stat conf_stat;
// if command was 'write terminal' or 'show running-config'
if (argc == 2 && (!strcmp(argv[idx_type]->text, "terminal") ||
!strcmp(argv[0]->text, "show")))
if (argc == 2 && (strmatch(argv[idx_type]->text, "terminal") ||
strmatch(argv[0]->text, "show")))
{
vty_write_config (vty);
return CMD_SUCCESS;

2
nhrpd/nhrp_vty.c
View File

@ -493,7 +493,7 @@ DEFUN(if_nhrp_map, if_nhrp_map_cmd,
return nhrp_vty_return(vty, NHRP_ERR_FAIL);
c->map = 1;
if (strcmp(argv[4]->text, "local") == 0) {
if (strmatch(argv[4]->text, "local")) {
nhrp_cache_update_binding(c, NHRP_CACHE_LOCAL, 0, NULL, 0, NULL);
} else{
if (str2sockunion(argv[4]->arg, &nbma_addr) < 0)

12
ospf6d/ospf6_lsa.c
View File

@ -850,11 +850,11 @@ DEFUN (debug_ospf6_lsa_type,
if (argc == 5)
{
if (! strcmp (argv[idx_type]->text, "originate"))
if (strmatch(argv[idx_type]->text, "originate"))
SET_FLAG (handler->debug, OSPF6_LSA_DEBUG_ORIGINATE);
else if (! strcmp (argv[idx_type]->text, "examine"))
else if (strmatch(argv[idx_type]->text, "examine"))
SET_FLAG (handler->debug, OSPF6_LSA_DEBUG_EXAMIN);
else if (! strcmp (argv[idx_type]->text, "flooding"))
else if (strmatch(argv[idx_type]->text, "flooding"))
SET_FLAG (handler->debug, OSPF6_LSA_DEBUG_FLOOD);
}
else
@ -903,11 +903,11 @@ DEFUN (no_debug_ospf6_lsa_type,
if (argc == 6)
{
if (! strcmp (argv[idx_type]->text, "originate"))
if (strmatch(argv[idx_type]->text, "originate"))
UNSET_FLAG (handler->debug, OSPF6_LSA_DEBUG_ORIGINATE);
if (! strcmp (argv[idx_type]->text, "examine"))
if (strmatch(argv[idx_type]->text, "examine"))
UNSET_FLAG (handler->debug, OSPF6_LSA_DEBUG_EXAMIN);
if (! strcmp (argv[idx_type]->text, "flooding"))
if (strmatch(argv[idx_type]->text, "flooding"))
UNSET_FLAG (handler->debug, OSPF6_LSA_DEBUG_FLOOD);
}
else

16
ospf6d/ospf6_route.c
View File

@ -1313,43 +1313,43 @@ ospf6_route_table_show (struct vty *vty, int argc_start, int argc, struct cmd_to
for (i = argc_start; i < argc; i++)
{
if (! strcmp (argv[i]->arg, "summary"))
if (strmatch(argv[i]->text, "summary"))
{
summary++;
continue;
}
if (! strcmp (argv[i]->arg, "intra-area"))
if (strmatch(argv[i]->text, "intra-area"))
{
type = OSPF6_PATH_TYPE_INTRA;
continue;
}
if (! strcmp (argv[i]->arg, "inter-area"))
if (strmatch(argv[i]->text, "inter-area"))
{
type = OSPF6_PATH_TYPE_INTER;
continue;
}
if (! strcmp (argv[i]->arg, "external-1"))
if (strmatch(argv[i]->text, "external-1"))
{
type = OSPF6_PATH_TYPE_EXTERNAL1;
continue;
}
if (! strcmp (argv[i]->arg, "external-2"))
if (strmatch(argv[i]->text, "external-2"))
{
type = OSPF6_PATH_TYPE_EXTERNAL2;
continue;
}
if (! strcmp (argv[i]->arg, "detail"))
if (strmatch(argv[i]->text, "detail"))
{
detail++;
continue;
}
if (! strcmp (argv[i]->arg, "match"))
if (strmatch(argv[i]->text, "match"))
{
match++;
continue;
@ -1488,7 +1488,7 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
for (i = idx_ipv4; i < argc; i++)
{
if (! strcmp (argv[i]->arg, "detail"))
if (strmatch(argv[i]->text, "detail"))
{
detail++;
continue;

6
ospfd/ospf_vty.c
View File

@ -374,7 +374,7 @@ DEFUN (ospf_passive_interface,
struct ospf_if_params *params;
struct route_node *rn;
if (strcmp (argv[1]->text, "default") == 0)
if (strmatch(argv[1]->text, "default"))
{
ospf_passive_interface_default (ospf, OSPF_IF_PASSIVE);
return CMD_SUCCESS;
@ -444,7 +444,7 @@ DEFUN (no_ospf_passive_interface,
int ret;
struct route_node *rn;
if (strcmp (argv[2]->text, "default") == 0)
if (strmatch(argv[2]->text, "default"))
{
ospf_passive_interface_default (ospf, OSPF_IF_ACTIVE);
return CMD_SUCCESS;
@ -1090,7 +1090,7 @@ DEFUN (ospf_area_vlink,
i++;
}
else if (strncmp (argv[i+1]->arg, "m", 1) == 0
&& strcmp (argv[i+1]->arg, "message-digest-") != 0)
&& !strmatch(argv[i + 1]->text, "message-digest-"))
{
/* "authentication message-digest" */
vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC;

16
zebra/zebra_vty.c
View File

@ -2185,7 +2185,7 @@ DEFUN (ipv6_route,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[3]->text, "from"))
if (strmatch(argv[3]->text, "from"))
{
src = argv[4]->arg;
idx_ipv6_ifname = 5;
@ -2234,7 +2234,7 @@ DEFUN (ipv6_route_flags,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[3]->text, "from"))
if (strmatch(argv[3]->text, "from"))
{
src = argv[4]->arg;
idx_ipv6_ifname = 5;
@ -2283,7 +2283,7 @@ DEFUN (ipv6_route_ifname,
int idx_curr = 5;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[3]->text, "from"))
if (strmatch(argv[3]->text, "from"))
{
src = argv[4]->arg;
idx_ipv6 = 5;
@ -2335,7 +2335,7 @@ DEFUN (ipv6_route_ifname_flags,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[3]->text, "from"))
if (strmatch(argv[3]->text, "from"))
{
src = argv[4]->arg;
idx_ipv6 = 5;
@ -2387,7 +2387,7 @@ DEFUN (no_ipv6_route,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[4]->text, "from"))
if (strmatch(argv[4]->text, "from"))
{
src = argv[5]->arg;
idx_ipv6_ifname = 6;
@ -2436,7 +2436,7 @@ DEFUN (no_ipv6_route_flags,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[4]->text, "from"))
if (strmatch(argv[4]->text, "from"))
{
src = argv[5]->arg;
idx_ipv6_ifname = 6;
@ -2486,7 +2486,7 @@ DEFUN (no_ipv6_route_ifname,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[4]->text, "from"))
if (strmatch(argv[4]->text, "from"))
{
src = argv[5]->arg;
idx_ipv6 = 6;
@ -2539,7 +2539,7 @@ DEFUN (no_ipv6_route_ifname_flags,
int idx_curr;
char *src, *tag, *distance, *vrf;
if (!strcmp(argv[4]->text, "from"))
if (strmatch(argv[4]->text, "from"))
{
src = argv[5]->arg;
idx_ipv6 = 6;