chiark / gitweb /
delta: use wait_for_terminate_and_warn() to generate warnin when diff fails
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Oct 2014 16:48:11 +0000 (18:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 24 Oct 2014 16:48:11 +0000 (18:48 +0200)
src/delta/delta.c

index 2fdbeeae81e38c66b751a533301a6256e5d8a792..25c4a0bcfc28a220721d676b36fa0ed83751681a 100644 (file)
@@ -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;
 
 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);
         pid_t pid;
 
         assert(top);
@@ -194,10 +194,7 @@ static int found_override(const char *top, const char *bottom) {
                 _exit(1);
         }
 
                 _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;
         putchar('\n');
 
         return k;