treewide: more log_*_errno() conversions, multiline calls

[elogind.git] / src / journal / journalctl.c

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 6077b6e1a2a8c5439c6f0942fa92270733805e01..96b0ddd80f3fface13930b39eac1b62da54688ae 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1382,7 +1382,7 @@ static int setup_keys(void) {
         log_info("Generating seed...");
         l = loop_read(fd, seed, seed_size, true);
         if (l < 0 || (size_t) l != seed_size) {
-                log_error("Failed to read random seed: %s", strerror(EIO));
+                log_error_errno(EIO, "Failed to read random seed: %m");
                 r = -EIO;
                 goto finish;
         }
@@ -1428,14 +1428,14 @@ static int setup_keys(void) {
 
         l = loop_write(fd, &h, sizeof(h), false);
         if (l < 0 || (size_t) l != sizeof(h)) {
-                log_error("Failed to write header: %s", strerror(EIO));
+                log_error_errno(EIO, "Failed to write header: %m");
                 r = -EIO;
                 goto finish;
         }
 
         l = loop_write(fd, state, state_size, false);
         if (l < 0 || (size_t) l != state_size) {
-                log_error("Failed to write state: %s", strerror(EIO));
+                log_error_errno(EIO, "Failed to write state: %m");
                 r = -EIO;
                 goto finish;
         }
@@ -1662,8 +1662,7 @@ static int access_check(sd_journal *j) {
                 assert(err > 0);
 
                 if (err != EACCES)
-                        log_warning("Error was encountered while opening journal files: %s",
-                                    strerror(err));
+                        log_warning_errno(err, "Error was encountered while opening journal files: %m");
         }
 
         return r;
@@ -1814,9 +1813,8 @@ int main(int argc, char *argv[]) {
         else
                 r = sd_journal_open(&j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type);
         if (r < 0) {
-                log_error("Failed to open %s: %s",
-                          arg_directory ? arg_directory : arg_file ? "files" : "journal",
-                          strerror(-r));
+                log_error_errno(r, "Failed to open %s: %m",
+                                arg_directory ? arg_directory : arg_file ? "files" : "journal");
                 return EXIT_FAILURE;
         }