treewide: more log_*_errno + return simplifications

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

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index af155b487f3ee091cf06df2b3fb8d2cccc571072..c22d0b0471117d2ba133ad149cfe1fe30a76017f 100644 (file)
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -312,10 +312,8 @@ static int save_external_coredump(
         assert(ret_size);
 
         r = make_filename(info, &fn);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to determine coredump file name: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to determine coredump file name: %m");
 
         tmp = tempfn_random(fn);
         if (!tmp)
@@ -337,7 +335,7 @@ static int save_external_coredump(
                 log_error("Not enough disk space for coredump of %s (%s), refusing.", info[INFO_PID], info[INFO_COMM]);
                 goto fail;
         } else if (r < 0) {
-                log_error_errno(-r, "Failed to dump coredump to file: %m");
+                log_error_errno(r, "Failed to dump coredump to file: %m");
                 goto fail;
         }
 
@@ -379,7 +377,7 @@ static int save_external_coredump(
 
                 r = compress_stream(fd, fd_compressed, -1);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to compress %s: %m", tmp_compressed);
+                        log_error_errno(r, "Failed to compress %s: %m", tmp_compressed);
                         goto fail_compressed;
                 }
 
@@ -445,10 +443,8 @@ static int allocate_journal_field(int fd, size_t size, char **ret, size_t *ret_s
         memcpy(field, "COREDUMP=", 9);
 
         n = read(fd, field + 9, size);
-        if (n < 0) {
-                log_error_errno(-n, "Failed to read core data: %m");
-                return (int) n;
-        }
+        if (n < 0)
+                return log_error_errno((int) n, "Failed to read core data: %m");
         if ((size_t) n < size) {
                 log_error("Core data too short.");
                 return -EIO;
@@ -841,7 +837,7 @@ int main(int argc, char* argv[]) {
                 else if (r == -EINVAL)
                         log_warning("Failed to generate stack trace: %s", dwfl_errmsg(dwfl_errno()));
                 else
-                        log_warning_errno(-r, "Failed to generate stack trace: %m");
+                        log_warning_errno(r, "Failed to generate stack trace: %m");
         }
 
         if (!core_message)
@@ -868,7 +864,7 @@ log:
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
-                log_error_errno(-r, "Failed to log coredump: %m");
+                log_error_errno(r, "Failed to log coredump: %m");
 
 finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;