chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 32fa7be0aaf3796c010ebd8c90b7a235f636a444..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);
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)
tmp = tempfn_random(fn);
if (!tmp)
@@
-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);
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;
if ((size_t) n < size) {
log_error("Core data too short.");
return -EIO;