X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fkillall.c;h=5a50ae6f045e5d024ec8434ee047a689abc97e03;hb=652212b0c2b60b9ef9b2e24eae82401f880fa21a;hp=291e1f90eeb192be472f2faf876a04c4e0521093;hpb=e1d758033dc7e101ab32323a0f1649d8daf56a22;p=elogind.git

diff --git a/src/core/killall.c b/src/core/killall.c
index 291e1f90e..5a50ae6f0 100644
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -102,7 +102,7 @@ static void wait_for_children(Set *pids, sigset_t *mask) {
                                 if (errno == ECHILD)
                                         break;
 
-                                log_error("waitpid() failed: %m");
+                                log_error_errno(errno, "waitpid() failed: %m");
                                 return;
                         }
 
@@ -136,7 +136,7 @@ static void wait_for_children(Set *pids, sigset_t *mask) {
                 if (k != SIGCHLD) {
 
                         if (k < 0 && errno != EAGAIN) {
-                                log_error("sigtimedwait() failed: %m");
+                                log_error_errno(errno, "sigtimedwait() failed: %m");
                                 return;
                         }
 
@@ -178,7 +178,7 @@ static int killall(int sig, Set *pids, bool send_sighup) {
                         if (pids)
                                 set_put(pids, ULONG_TO_PTR(pid));
                 } else if (errno != ENOENT)
-                        log_warning("Could not kill %d: %m", pid);
+                        log_warning_errno(errno, "Could not kill %d: %m", pid);
 
                 if (send_sighup) {
                         /* Optionally, also send a SIGHUP signal, but
@@ -205,19 +205,19 @@ void broadcast_signal(int sig, bool wait_for_exit, bool send_sighup) {
         _cleanup_set_free_ Set *pids = NULL;
 
         if (wait_for_exit)
-                pids = set_new(trivial_hash_func, trivial_compare_func);
+                pids = set_new(NULL);
 
         assert_se(sigemptyset(&mask) == 0);
         assert_se(sigaddset(&mask, SIGCHLD) == 0);
         assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
 
         if (kill(-1, SIGSTOP) < 0 && errno != ESRCH)
-                log_warning("kill(-1, SIGSTOP) failed: %m");
+                log_warning_errno(errno, "kill(-1, SIGSTOP) failed: %m");
 
         killall(sig, pids, send_sighup);
 
         if (kill(-1, SIGCONT) < 0 && errno != ESRCH)
-                log_warning("kill(-1, SIGCONT) failed: %m");
+                log_warning_errno(errno, "kill(-1, SIGCONT) failed: %m");
 
         if (wait_for_exit)
                 wait_for_children(pids, &mask);