The branch, 1.0.112 has been updated via 9b95d6c9332977c1a216782ba57c4d9072b5de1e (commit) from f26749ea3080ccfabc8d6dfe482e8b72495c9c10 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.112 - Log ----------------------------------------------------------------- commit 9b95d6c9332977c1a216782ba57c4d9072b5de1e Author: Ronnie Sahlberg <sahlberg@lenovo-laptop.(none)> Date: Wed Mar 2 04:24:15 2011 +1100 Suppress a log message properly ----------------------------------------------------------------------- Summary of changes: server/ctdb_daemon.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c index 3eb832e..4c35b1c 100644 --- a/server/ctdb_daemon.c +++ b/server/ctdb_daemon.c @@ -695,8 +695,10 @@ static void sig_child_handler(struct event_context *ev, while (pid != 0) { pid = waitpid(-1, &status, WNOHANG); - if (pid == -1 && errno != ECHILD) { - DEBUG(DEBUG_ERR, (__location__ " waitpid() returned error. errno:%d\n", errno)); + if (pid == -1) { + if (errno != ECHILD) { + DEBUG(DEBUG_ERR, (__location__ " waitpid() returned error. errno:%d\n", errno)); + } return; } if (pid > 0) { -- CTDB repository