From 28d9d86dd54c530c19141de3adf139e200f4da01 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 14 Nov 2007 14:04:34 +0000 Subject: [PATCH] We should always give eend a message. --- src/start-stop-daemon.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/start-stop-daemon.c b/src/start-stop-daemon.c index 6bdf145a..83ec0387 100644 --- a/src/start-stop-daemon.c +++ b/src/start-stop-daemon.c @@ -314,16 +314,12 @@ static int do_stop (const char *exec, const char *cmd, ebegin ("Sending signal %d to PID %d", sig, pids[i]); errno = 0; killed = (kill (pids[i], sig) == 0 || errno == ESRCH ? true : false); + if (verbose) + eend (killed ? 0 : 1, "%s: failed to send signal %d to PID %d: %s", + applet, sig, pids[i], strerror (errno)); if (! killed) { - if (! quiet) - eerror ("%s: failed to send signal %d to PID %d: %s", - applet, sig, pids[i], strerror (errno)); - if (verbose) - eend (1, NULL); nkilled = -1; } else { - if (verbose) - eend (0, NULL); if (nkilled != -1) nkilled++; }