>From 763086bc45b8814751260ed5654051354c245e54 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 21 Aug 2013 11:13:56 +0200 Subject: [PATCH 2/3] Use brackets around macros. warnings reported by cppcheck. --- src/monitor/monitor.c | 8 ++++---- src/util/child_common.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 67811ac16f91fa4e6f97ab2cf2ff977855d95751..7604b30988502fcea32ee81b936083a99d53c939 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -1420,9 +1420,9 @@ static void monitor_quit(struct mt_ctx *mt_ctx, int ret) } } else if (pid != 0) { error = 0; - if WIFEXITED(status) { + if (WIFEXITED(status)) { DEBUG(1, ("Child [%s] exited gracefully\n", svc->name)); - } else if WIFSIGNALED(status) { + } else if (WIFSIGNALED(status)) { DEBUG(1, ("Child [%s] terminated with a signal\n", svc->name)); } else { DEBUG(0, ("Child [%s] did not exit cleanly\n", svc->name)); @@ -2573,11 +2573,11 @@ static void mt_svc_exit_handler(int pid, int wait_status, void *pvt) struct timeval tv; int restart_delay; - if WIFEXITED(wait_status) { + if (WIFEXITED(wait_status)) { DEBUG(SSSDBG_OP_FAILURE, ("Child [%s] exited with code [%d]\n", svc->name, WEXITSTATUS(wait_status))); - } else if WIFSIGNALED(wait_status) { + } else if (WIFSIGNALED(wait_status)) { DEBUG(SSSDBG_OP_FAILURE, ("Child [%s] terminated with signal [%d]\n", svc->name, WTERMSIG(wait_status))); diff --git a/src/util/child_common.c b/src/util/child_common.c index ec2baf0192cf46cda72b596a4def0ceb77880005..2bd2bbc3a557ea61c3bcf517a48b3673bd3d6d4f 100644 --- a/src/util/child_common.c +++ b/src/util/child_common.c @@ -553,22 +553,22 @@ void child_sig_handler(struct tevent_context *ev, } else if (ret == 0) { DEBUG(1, ("waitpid did not found a child with changed status.\n")); } else { - if WIFEXITED(child_ctx->child_status) { + if (WIFEXITED(child_ctx->child_status)) { if (WEXITSTATUS(child_ctx->child_status) != 0) { DEBUG(1, ("child [%d] failed with status [%d].\n", ret, WEXITSTATUS(child_ctx->child_status))); } else { DEBUG(4, ("child [%d] finished successfully.\n", ret)); } - } else if WIFSIGNALED(child_ctx->child_status) { + } else if (WIFSIGNALED(child_ctx->child_status)) { DEBUG(1, ("child [%d] was terminated by signal [%d].\n", ret, WTERMSIG(child_ctx->child_status))); } else { - if WIFSTOPPED(child_ctx->child_status) { + if (WIFSTOPPED(child_ctx->child_status)) { DEBUG(7, ("child [%d] was stopped by signal [%d].\n", ret, WSTOPSIG(child_ctx->child_status))); } - if WIFCONTINUED(child_ctx->child_status) { + if (WIFCONTINUED(child_ctx->child_status)) { DEBUG(7, ("child [%d] was resumed by delivery of SIGCONT.\n", ret)); } -- 1.8.3.1