X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=5bb4247c8cbef713d27aaf7d553b87e9e83eb342;hb=a6d305f91d722e136c29222070efed5c5d8b120b;hp=e0a5542fa9c1ed4ea4c35c71a714a127b908ceb4;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index e0a5542fa..5bb4247c8 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -194,8 +194,8 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'f':
                         r = safe_atod(optarg, &arg_hz);
                         if (r < 0)
-                                log_warning("failed to parse --freq/-f argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --freq/-f argument '%s': %m",
+                                                  optarg);
                         break;
                 case 'F':
                         arg_filter = false;
@@ -209,8 +209,8 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'n':
                         r = safe_atoi(optarg, &arg_samples_len);
                         if (r < 0)
-                                log_warning("failed to parse --samples/-n argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --samples/-n argument '%s': %m",
+                                                  optarg);
                         break;
                 case 'o':
                         path_kill_slashes(optarg);
@@ -226,14 +226,14 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'x':
                         r = safe_atod(optarg, &arg_scale_x);
                         if (r < 0)
-                                log_warning("failed to parse --scale-x/-x argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --scale-x/-x argument '%s': %m",
+                                                  optarg);
                         break;
                 case 'y':
                         r = safe_atod(optarg, &arg_scale_y);
                         if (r < 0)
-                                log_warning("failed to parse --scale-y/-y argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --scale-y/-y argument '%s': %m",
+                                                  optarg);
                         break;
                 case 'e':
                         arg_entropy = true;
@@ -285,12 +285,12 @@ static void do_journal_append(char *file) {
 
         f = open(file, O_RDONLY|O_CLOEXEC);
         if (f < 0) {
-                log_error("Failed to read bootchart data: %m");
+                log_error_errno(errno, "Failed to read bootchart data: %m");
                 return;
         }
         n = loop_read(f, p + 10, BOOTCHART_MAX, false);
         if (n < 0) {
-                log_error_errno(-n, "Failed to read bootchart data: %m");
+                log_error_errno(n, "Failed to read bootchart data: %m");
                 close(f);
                 return;
         }
@@ -302,7 +302,7 @@ static void do_journal_append(char *file) {
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
-                log_error_errno(-r, "Failed to send bootchart: %m");
+                log_error_errno(r, "Failed to send bootchart: %m");
 }
 
 int main(int argc, char *argv[]) {
@@ -434,7 +434,7 @@ int main(int argc, char *argv[]) {
                                         /* caught signal, probably HUP! */
                                         break;
                                 }
-                                log_error("nanosleep() failed: %m");
+                                log_error_errno(errno, "nanosleep() failed: %m");
                                 exit(EXIT_FAILURE);
                         }
                 } else {