proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldpd: redundant condition (cppcheck)

Browse Source 
Signed-off-by: F. Aragon <paco@voltanet.io>
This commit is contained in:
paco 2018-06-18 17:25:20 +02:00
parent 6389e663e9
commit 0e8d7233e3
No known key found for this signature in database
GPG Key ID: FD112A8C7E6A5E4A
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ldpd/ldpd.c
View File

@ -406,16 +406,32 @@ ldpd_shutdown(void)
free(vty_conf); free(vty_conf);
log_debug("waiting for children to terminate"); log_debug("waiting for children to terminate");
do {
while (true) {
/* Wait for child process. */
pid = wait(&status); pid = wait(&status);
if (pid == -1) { if (pid == -1) {
if (errno != EINTR && errno != ECHILD) /* We got interrupted, try again. */
fatal("wait"); if (errno == EINTR)
} else if (WIFSIGNALED(status)) continue;
/* No more processes were found. */
if (errno != ECHILD)
break;
/* Unhandled errno condition. */
fatal("wait");
/* UNREACHABLE */
}
/* We found something, lets announce it. */
if (WIFSIGNALED(status))
log_warnx("%s terminated; signal %d", log_warnx("%s terminated; signal %d",
(pid == lde_pid) ? "label decision engine" : (pid == lde_pid ? "label decision engine"
"ldp engine", WTERMSIG(status)); : "ldp engine"),
} while (pid != -1 || (pid == -1 && errno == EINTR)); WTERMSIG(status));
/* Repeat until there are no more child processes. */
}
free(iev_ldpe); free(iev_ldpe);
free(iev_lde); free(iev_lde);