scan-build: cleanup some warnings

Current cleanup is for unset values or variables that are not used anymore.

Regarding ospfd/ospf_vty.c: argv_find()
  we'll never get it NULL, so get coststr = argv[idx]->arg;
This commit is contained in:
Vincent JARDIN 2017-09-27 23:38:19 +02:00
parent 80a5a11bb1
commit c31a793b48
5 changed files with 12 additions and 10 deletions

View File

@ -279,8 +279,7 @@ babel_load_state_file(void)
if(fd >= 0 && rc < 0) {
zlog_err("unlink(babel-state): %s", safe_strerror(errno));
/* If we couldn't unlink it, it's probably stale. */
close(fd);
fd = -1;
goto fini;
}
if(fd >= 0) {
char buf[100];
@ -315,9 +314,12 @@ babel_load_state_file(void)
zlog_err("Couldn't parse babel-state.");
}
}
close(fd);
fd = -1;
goto fini;
}
fini:
if (fd >= 0)
close(fd);
return ;
}
static void

View File

@ -1619,7 +1619,7 @@ static int zclient_read_sync_response(struct zclient *zclient,
u_int16_t expected_cmd)
{
struct stream *s;
u_int16_t size;
u_int16_t size = -1;
u_char marker;
u_char version;
vrf_id_t vrf_id;

View File

@ -6075,12 +6075,11 @@ DEFUN (ip_ospf_cost,
// get arguments
char *coststr = NULL, *ifaddr = NULL;
coststr = argv_find(argv, argc, "(1-65535)", &idx) ? argv[idx]->arg
: NULL;
ifaddr = argv_find(argv, argc, "A.B.C.D", &idx) ? argv[idx]->arg : NULL;
argv_find(argv, argc, "(1-65535)", &idx);
coststr = argv[idx]->arg;
cost = strtol(coststr, NULL, 10);
ifaddr = argv_find(argv, argc, "A.B.C.D", &idx) ? argv[idx]->arg : NULL;
if (ifaddr) {
if (!inet_aton(ifaddr, &addr)) {
vty_out(vty,

View File

@ -194,7 +194,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr,
}
if (up != NULL)
up = hash_get(pnc->upstream_hash, up, hash_alloc_intern);
hash_get(pnc->upstream_hash, up, hash_alloc_intern);
if (pnc && CHECK_FLAG(pnc->flags, PIM_NEXTHOP_VALID)) {
memcpy(out_pnc, pnc, sizeof(struct pim_nexthop_cache));

View File

@ -304,6 +304,7 @@ static void addr2hostprefix(int af, const union g_addr *addr,
prefix->u.prefix6 = addr->ipv6;
break;
default:
memset(prefix, 0, sizeof(*prefix));
zlog_warn("%s: unknown address family %d", __func__, af);
break;
}