diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-09-09 11:08:23 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-09-09 14:58:26 +0200 |
commit | 94c156cd452424ea59931920df2454d9da7cb774 (patch) | |
tree | f8ce0a2319c4a88b42b523002374473d6f1967a3 /src/journal | |
parent | 9c00a6adfa6c2ded071222b2ec76295480add34e (diff) |
tree-wide: make use of log_error_errno() return value in more cases
The previous coccinelle semantic patch that improved usage of
log_error_errno()'s return value, only looked for log_error_errno()
invocations with a single parameter after the error parameter. Update
the patch to handle arbitrary numbers of additional arguments.
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/coredumpctl.c | 5 | ||||
-rw-r--r-- | src/journal/journalctl.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c index 0fa427003b..0546290318 100644 --- a/src/journal/coredumpctl.c +++ b/src/journal/coredumpctl.c @@ -646,8 +646,9 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) { fdf = open(filename, O_RDONLY | O_CLOEXEC); if (fdf < 0) { - log_error_errno(errno, "Failed to open %s: %m", filename); - r = -errno; + r = log_error_errno(errno, + "Failed to open %s: %m", + filename); goto error; } diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d31ab1c6d7..576e4e4d03 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1453,8 +1453,7 @@ static int setup_keys(void) { safe_close(fd); fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC); if (fd < 0) { - log_error_errno(errno, "Failed to open %s: %m", k); - r = -errno; + r = log_error_errno(errno, "Failed to open %s: %m", k); goto finish; } |