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>
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;
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)
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)
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;
}
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;
}
if (!h)
return CMD_WARNING;
- if (!strcmp (argv[1]->arg, "infinite"))
+ if (strmatch(argv[1]->text, "infinite"))
{
rspint = RFAPI_INFINITE_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;
}
return CMD_WARNING;
}
- if (!strcmp (argv[3]->arg, "bgp-direct"))
+ if (strmatch(argv[3]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
route_type = ZEBRA_ROUTE_BGP_DIRECT_EXT;
}
- if (!strcmp (argv[4]->arg, "ipv4"))
+ if (strmatch(argv[4]->text, "ipv4"))
{
afi = AFI_IP;
}
return CMD_WARNING;
}
- if (!strcmp (argv[2]->arg, "bgp-direct"))
+ if (strmatch(argv[2]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
route_type = ZEBRA_ROUTE_BGP_DIRECT_EXT;
}
- if (!strcmp (argv[3]->arg, "ipv4"))
+ if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
return CMD_WARNING;
}
- if (!strcmp (argv[3]->arg, "bgp-direct"))
+ if (strmatch(argv[3]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
return CMD_WARNING;
}
- if (!strcmp (argv[2]->arg, "bgp-direct"))
+ if (strmatch(argv[2]->text, "bgp-direct"))
{
route_type = ZEBRA_ROUTE_BGP_DIRECT;
}
return CMD_WARNING;
}
- if (!strcmp (argv[3]->arg, "ipv4"))
+ if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
return CMD_WARNING;
}
- if (!strcmp (argv[2]->arg, "ipv4"))
+ if (strmatch(argv[2]->text, "ipv4"))
{
afi = AFI_IP;
}
return CMD_WARNING;
}
- if (!strcmp (argv[3]->arg, "ipv4"))
+ if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
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))
{
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])
return CMD_WARNING;
}
- if (!strcmp (argv[2]->arg, "ipv4"))
+ if (strmatch(argv[2]->text, "ipv4"))
{
afi = AFI_IP;
}
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))
{
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)
return CMD_WARNING;
}
- if (!strcmp (argv[4]->arg, "ipv4"))
+ if (strmatch(argv[4]->text, "ipv4"))
{
afi = AFI_IP;
}
{
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))
{
{
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))
{
return CMD_WARNING;
}
- if (!strcmp (argv[3]->arg, "ipv4"))
+ if (strmatch(argv[3]->text, "ipv4"))
{
afi = AFI_IP;
}
{
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))
{
{
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))
{
return CMD_WARNING;
}
- if (!strcmp (argv[1]->arg, "auto:vn"))
+ if (strmatch(argv[1]->text, "auto:vn"))
{
rfg->l2rd = 0;
}
return CMD_WARNING;
}
- if (!strcmp (argv[1]->arg, "infinite"))
+ if (strmatch(argv[1]->text, "infinite"))
{
rspint = RFAPI_INFINITE_LIFETIME;
}
}
rfapiQprefix2Rprefix (&pfx, &hpfx);
- if (!strcmp (argv[10]->arg, "infinite"))
+ if (strmatch(argv[10]->text, "infinite"))
{
lifetime = RFAPI_INFINITE_LIFETIME;
}
}
rfapiQprefix2Rprefix (&pfx, &hpfx);
- if (!strcmp (argv[10]->arg, "infinite"))
+ if (strmatch(argv[10]->text, "infinite"))
{
lifetime = RFAPI_INFINITE_LIFETIME;
}
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);
for (; argc; --argc, ++argv)
{
- if (!strcmp (argv[0]->arg, "local-next-hop"))
+ if (strmatch(argv[0]->text, "local-next-hop"))
{
if (arg_lnh)
{
++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)
{
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)
{
{
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)
{
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;
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;
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)
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
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
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;
for (i = idx_ipv4; i < argc; i++)
{
- if (! strcmp (argv[i]->arg, "detail"))
+ if (strmatch(argv[i]->text, "detail"))
{
detail++;
continue;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;