From 872c8faaf2009422a91d227ae0b5c6f04c9d2c69 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 11 Oct 2013 19:34:17 -0400 Subject: Fix write-only use of a few variables Since the invention of read-only memory, write-only memory has been considered deprecated. Where appropriate, either make use of the value, or avoid writing it, to make it clear that it is not used. --- src/journal/coredump.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/journal/coredump.c') diff --git a/src/journal/coredump.c b/src/journal/coredump.c index 68c353fe83..733373b307 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -240,7 +240,7 @@ int main(int argc, char* argv[]) { coredump_bufsize = COREDUMP_MIN_START; coredump_data = malloc(coredump_bufsize); if (!coredump_data) { - r = log_oom(); + log_warning("Failed to allocate memory for core, core will not be stored."); goto finalize; } @@ -251,7 +251,7 @@ int main(int argc, char* argv[]) { n = loop_read(STDIN_FILENO, coredump_data + coredump_size, coredump_bufsize - coredump_size, false); if (n < 0) { - log_error("Failed to read core dump data: %s", strerror(-n)); + log_error("Failed to read core data: %s", strerror(-n)); r = (int) n; goto finish; } else if (n == 0) @@ -259,13 +259,13 @@ int main(int argc, char* argv[]) { coredump_size += n; - if(coredump_size > COREDUMP_MAX) { - log_error("Coredump too large, ignoring"); + if (coredump_size > COREDUMP_MAX) { + log_error("Core too large, core will not be stored."); goto finalize; } if (!GREEDY_REALLOC(coredump_data, coredump_bufsize, coredump_size + 1)) { - r = log_oom(); + log_warning("Failed to allocate memory for core, core will not be stored."); goto finalize; } } @@ -277,7 +277,7 @@ int main(int argc, char* argv[]) { finalize: r = sd_journal_sendv(iovec, j); if (r < 0) - log_error("Failed to send coredump: %s", strerror(-r)); + log_error("Failed to log coredump: %s", strerror(-r)); finish: return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -- cgit v1.2.3-54-g00ecf