summaryrefslogtreecommitdiff
path: root/src/import
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-04-29 19:23:23 +0200
committerLennart Poettering <lennart@poettering.net>2016-05-02 11:15:30 +0200
commit89c9030d319e118fa324fa5a1302ba53180b05b6 (patch)
tree3020eb7a0d26d5f8a8cfad092102de3f44b1dc28 /src/import
parent5659958529d16f082a24d0c5b68699570b3eace3 (diff)
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.
Diffstat (limited to 'src/import')
-rw-r--r--src/import/pull-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index d301d4d79e..dc4e4667a9 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -330,7 +330,7 @@ int pull_verify(PullJob *main_job,
_cleanup_close_ int sig_file = -1;
const char *p, *line;
char sig_file_path[] = "/tmp/sigXXXXXX", gpg_home[] = "/tmp/gpghomeXXXXXX";
- _cleanup_sigkill_wait_ pid_t pid = 0;
+ _cleanup_(sigkill_waitp) pid_t pid = 0;
bool gpg_home_created = false;
int r;