X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=78ceeb6fab384e4bdbc3b234c866060a1383d041;hb=d01efa07444e49aafd78e0aa822168da688d53f5;hp=f5158735fa54835cd56791769d71353cc05ededc;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index f5158735f..78ceeb6fa 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -35,7 +35,7 @@
 #include "special.h"
 #include "bus-util.h"
 #include "bus-error.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
 #include "fileio.h"
 #include "udev-util.h"
 #include "path-util.h"
@@ -54,7 +54,7 @@ static void start_target(const char *target) {
 
         r = bus_open_system_systemd(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get D-Bus connection: %m");
+                log_error_errno(r, "Failed to get D-Bus connection: %m");
                 return;
         }
 
@@ -222,7 +222,7 @@ int main(int argc, char *argv[]) {
         const char *device, *type;
         bool root_directory;
         int progress_pipe[2] = { -1, -1 };
-        char dash_c[2+10+1];
+        char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1];
         struct stat st;
 
         if (argc > 2) {
@@ -238,7 +238,7 @@ int main(int argc, char *argv[]) {
 
         q = parse_proc_cmdline(parse_proc_cmdline_item);
         if (q < 0)
-                log_warning_errno(-q, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
 
         test_files();
 
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) {
                 root_directory = false;
 
                 if (stat(device, &st) < 0) {
-                        log_error("Failed to stat '%s': %m", device);
+                        log_error_errno(errno, "Failed to stat '%s': %m", device);
                         return EXIT_FAILURE;
                 }
 
@@ -271,7 +271,7 @@ int main(int argc, char *argv[]) {
                 /* Find root device */
 
                 if (stat("/", &st) < 0) {
-                        log_error("Failed to stat() the root directory: %m");
+                        log_error_errno(errno, "Failed to stat() the root directory: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -309,12 +309,12 @@ int main(int argc, char *argv[]) {
                         log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
                         return EXIT_SUCCESS;
                 } else if (r < 0)
-                        log_warning_errno(-r, "fsck.%s cannot be used for %s: %m", type, device);
+                        log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
         }
 
         if (arg_show_progress)
                 if (pipe(progress_pipe) < 0) {
-                        log_error("pipe(): %m");
+                        log_error_errno(errno, "pipe(): %m");
                         return EXIT_FAILURE;
                 }
 
@@ -336,8 +336,7 @@ int main(int argc, char *argv[]) {
                 cmdline[i++] = "-f";
 
         if (progress_pipe[1] >= 0) {
-                snprintf(dash_c, sizeof(dash_c), "-C%i", progress_pipe[1]);
-                char_array_0(dash_c);
+                xsprintf(dash_c, "-C%i", progress_pipe[1]);
                 cmdline[i++] = dash_c;
         }
 
@@ -346,7 +345,7 @@ int main(int argc, char *argv[]) {
 
         pid = fork();
         if (pid < 0) {
-                log_error("fork(): %m");
+                log_error_errno(errno, "fork(): %m");
                 goto finish;
         } else if (pid == 0) {
                 /* Child */
@@ -365,7 +364,7 @@ int main(int argc, char *argv[]) {
 
         q = wait_for_terminate(pid, &status);
         if (q < 0) {
-                log_error_errno(-q, "waitid(): %m");
+                log_error_errno(q, "waitid(): %m");
                 goto finish;
         }