From 89c9030d319e118fa324fa5a1302ba53180b05b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 29 Apr 2016 19:23:23 +0200 Subject: util: rework sigkill_wait() to not require pid_t pointer Let's make sigkill_wait() take a normal pid_t, and add sigkill_waitp() that takes a pointer (which is useful for usage in _cleanup_), following the usual logic we have for this. --- src/machine/image-dbus.c | 2 +- src/machine/operation.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/machine') diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index ca38f61dd3..db0ed03b69 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -166,7 +166,7 @@ int bus_image_method_clone( r = operation_new(m, child, message, errno_pipe_fd[0]); if (r < 0) { - (void) sigkill_wait(&child); + (void) sigkill_wait(child); return r; } diff --git a/src/machine/operation.c b/src/machine/operation.c index 53e996b48f..e8564c29f7 100644 --- a/src/machine/operation.c +++ b/src/machine/operation.c @@ -104,7 +104,7 @@ Operation *operation_free(Operation *o) { safe_close(o->errno_fd); if (o->pid > 1) - (void) sigkill_wait(&o->pid); + (void) sigkill_wait(o->pid); sd_bus_message_unref(o->message); -- cgit v1.2.3-54-g00ecf