proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 17:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd isisd zebra: misuse of comma operator

Browse Source 
Detected using ./configure CFLAGS=-Wcomma CC=clang

Signed-off-by: F. Aragon <paco@voltanet.io>
This commit is contained in:
F. Aragon 2018-09-14 15:47:41 +02:00
parent 6efca3442f
commit 1445b43c41
No known key found for this signature in database
GPG Key ID: FD112A8C7E6A5E4A
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/rfapi/rfapi_vty.c
View File

@ -2004,7 +2004,8 @@ register_add(struct vty *vty, struct cmd_token *carg_prefix,
"Missing parameter for local-next-hop\n"); "Missing parameter for local-next-hop\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
++argv, --argc; ++argv;
--argc;
arg_lnh = argv[0]->arg; arg_lnh = argv[0]->arg;
} }
if (strmatch(argv[0]->text, "local-cost")) { if (strmatch(argv[0]->text, "local-cost")) {
@ -2018,7 +2019,8 @@ register_add(struct vty *vty, struct cmd_token *carg_prefix,
"Missing parameter for local-cost\n"); "Missing parameter for local-cost\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
++argv, --argc; ++argv;
--argc;
arg_lnh_cost = argv[0]->arg; arg_lnh_cost = argv[0]->arg;
} }
} }

12
isisd/isis_circuit.c
View File

@ -897,16 +897,16 @@ void isis_circuit_print_vty(struct isis_circuit *circuit, struct vty *vty,
vty_out(vty, " IP Prefix(es):\n"); vty_out(vty, " IP Prefix(es):\n");
for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node, for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node,
ip_addr)) { ip_addr)) {
prefix2str(ip_addr, buf, sizeof(buf)), prefix2str(ip_addr, buf, sizeof(buf));
vty_out(vty, " %s\n", buf); vty_out(vty, " %s\n", buf);
} }
} }
if (circuit->ipv6_link && listcount(circuit->ipv6_link) > 0) { if (circuit->ipv6_link && listcount(circuit->ipv6_link) > 0) {
vty_out(vty, " IPv6 Link-Locals:\n"); vty_out(vty, " IPv6 Link-Locals:\n");
for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_link, node, for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_link, node,
ip_addr)) { ip_addr)) {
prefix2str(ip_addr, (char *)buf, BUFSIZ), prefix2str(ip_addr, (char *)buf, BUFSIZ);
vty_out(vty, " %s\n", buf); vty_out(vty, " %s\n", buf);
} }
} }
if (circuit->ipv6_non_link if (circuit->ipv6_non_link
@ -914,8 +914,8 @@ void isis_circuit_print_vty(struct isis_circuit *circuit, struct vty *vty,
vty_out(vty, " IPv6 Prefixes:\n"); vty_out(vty, " IPv6 Prefixes:\n");
for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_non_link, node, for (ALL_LIST_ELEMENTS_RO(circuit->ipv6_non_link, node,
ip_addr)) { ip_addr)) {
prefix2str(ip_addr, (char *)buf, BUFSIZ), prefix2str(ip_addr, (char *)buf, BUFSIZ);
vty_out(vty, " %s\n", buf); vty_out(vty, " %s\n", buf);
} }
} }

3
zebra/zebra_ns.c
View File

@ -275,8 +275,7 @@ int zebra_ns_disable(ns_id_t ns_id, void **info)
hash_clean(zns->rules_hash, zebra_pbr_rules_free); hash_clean(zns->rules_hash, zebra_pbr_rules_free);
hash_free(zns->rules_hash); hash_free(zns->rules_hash);
hash_clean(zns->ipset_entry_hash, hash_clean(zns->ipset_entry_hash, zebra_pbr_ipset_entry_free);
zebra_pbr_ipset_entry_free),
hash_clean(zns->ipset_hash, zebra_pbr_ipset_free); hash_clean(zns->ipset_hash, zebra_pbr_ipset_free);
hash_free(zns->ipset_hash); hash_free(zns->ipset_hash);
hash_free(zns->ipset_entry_hash); hash_free(zns->ipset_entry_hash);

3
zebra/zebra_vxlan.c
View File

@ -285,7 +285,8 @@ static void zvni_find_neigh_addr_width(struct hash_backet *backet, void *ctxt)
n = (zebra_neigh_t *)backet->data; n = (zebra_neigh_t *)backet->data;
ipaddr2str(&n->ip, buf, sizeof(buf)), width = strlen(buf); ipaddr2str(&n->ip, buf, sizeof(buf));
width = strlen(buf);
if (width > wctx->addr_width) if (width > wctx->addr_width)
wctx->addr_width = width; wctx->addr_width = width;