chiark / gitweb /
fsck: unify exit path for connect_plymouth()
[elogind.git] / src / path / path.c
index e4d8d1d53ca27d230a75f26c5a38fdf0587891c5..99a4f2f3c0058482340545325924a1151fcd21d3 100644 (file)
@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "sd-path.h"
 #include "build.h"
@@ -88,7 +86,7 @@ static int list_homes(void) {
                 if (q == -ENXIO)
                         continue;
                 if (q < 0) {
-                        log_error_errno(-r, "Failed to query %s: %m", path_table[i]);
+                        log_error_errno(r, "Failed to query %s: %m", path_table[i]);
                         r = q;
                         continue;
                 }
@@ -108,10 +106,8 @@ static int print_home(const char *n) {
                         _cleanup_free_ char *p = NULL;
 
                         r = sd_path_home(i, arg_suffix, &p);
-                        if (r < 0) {
-                                log_error_errno(-r, "Failed to query %s: %m", n);
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to query %s: %m", n);
 
                         printf("%s\n", p);
                         return 0;