From a572b2e00685af01b8b593e2f20c263b22840b32 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Oct 2014 18:48:11 +0200 Subject: [PATCH] delta: use wait_for_terminate_and_warn() to generate warnin when diff fails --- src/delta/delta.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/delta/delta.c b/src/delta/delta.c index 2fdbeeae8..25c4a0bcf 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -159,7 +159,7 @@ static int notify_override_unchanged(const char *f) { static int found_override(const char *top, const char *bottom) { _cleanup_free_ char *dest = NULL; - int k, r; + int k; pid_t pid; assert(top); @@ -194,10 +194,7 @@ static int found_override(const char *top, const char *bottom) { _exit(1); } - r = wait_for_terminate(pid, NULL); - if (r < 0) - log_warning("Failed to wait for diff: %s", strerror(-r)); - + wait_for_terminate_and_warn("diff", pid); putchar('\n'); return k; -- 2.30.2