treewide: use log_*_errno whenever %m is in the format string

[elogind.git] / src / journal-remote / journal-gatewayd.c

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 723b057c1de647bd14c4d95499ca53ca6ac8d032..7a99430a63c951e9b1556cb92bf3b60e7ba0f190 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -198,7 +198,7 @@ static ssize_t request_reader_entries(
                 else {
                         m->tmp = tmpfile();
                         if (!m->tmp) {
-                                log_error("Failed to create temporary file: %m");
+                                log_error_errno(errno, "Failed to create temporary file: %m");
                                 return MHD_CONTENT_READER_END_WITH_ERROR;
                         }
                 }
@@ -211,7 +211,7 @@ static ssize_t request_reader_entries(
 
                 sz = ftello(m->tmp);
                 if (sz == (off_t) -1) {
-                        log_error("Failed to retrieve file position: %m");
+                        log_error_errno(errno, "Failed to retrieve file position: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 }
 
@@ -219,7 +219,7 @@ static ssize_t request_reader_entries(
         }
 
         if (fseeko(m->tmp, pos, SEEK_SET) < 0) {
-                log_error("Failed to seek to position: %m");
+                log_error_errno(errno, "Failed to seek to position: %m");
                 return MHD_CONTENT_READER_END_WITH_ERROR;
         }
 
@@ -559,7 +559,7 @@ static ssize_t request_reader_fields(
                 else {
                         m->tmp = tmpfile();
                         if (!m->tmp) {
-                                log_error("Failed to create temporary file: %m");
+                                log_error_errno(errno, "Failed to create temporary file: %m");
                                 return MHD_CONTENT_READER_END_WITH_ERROR;
                         }
                 }
@@ -572,7 +572,7 @@ static ssize_t request_reader_fields(
 
                 sz = ftello(m->tmp);
                 if (sz == (off_t) -1) {
-                        log_error("Failed to retrieve file position: %m");
+                        log_error_errno(errno, "Failed to retrieve file position: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 }
 
@@ -580,7 +580,7 @@ static ssize_t request_reader_fields(
         }
 
         if (fseeko(m->tmp, pos, SEEK_SET) < 0) {
-                log_error("Failed to seek to position: %m");
+                log_error_errno(errno, "Failed to seek to position: %m");
                 return MHD_CONTENT_READER_END_WITH_ERROR;
         }
 
@@ -909,10 +909,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 return -EINVAL;
                         }
                         r = read_full_file(optarg, &key_pem, NULL);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to read key file: %m");
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to read key file: %m");
                         assert(key_pem);
                         break;
 
@@ -922,10 +920,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 return -EINVAL;
                         }
                         r = read_full_file(optarg, &cert_pem, NULL);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to read certificate file: %m");
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to read certificate file: %m");
                         assert(cert_pem);
                         break;
 
@@ -936,10 +932,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 return -EINVAL;
                         }
                         r = read_full_file(optarg, &trust_pem, NULL);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to read CA certificate file: %m");
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to read CA certificate file: %m");
                         assert(trust_pem);
                         break;
 #else