projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c3b99f
)
journal: coding style fix
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Mon, 15 Jan 2018 14:53:05 +0000
(23:53 +0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Mon, 15 Jan 2018 14:53:10 +0000
(23:53 +0900)
This is originally pointed out by @cpsw.
src/journal/journald-server.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index
278f38f
..
74536e1
100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-464,13
+464,14
@@
static int do_rotate(
return -EINVAL;
r = journal_file_rotate(f, s->compress, seal, s->deferred_closes);
- if (r < 0)
+ if (r < 0)
{
if (*f)
- log_error_errno(r, "Failed to rotate %s: %m", (*f)->path);
+
return
log_error_errno(r, "Failed to rotate %s: %m", (*f)->path);
else
- log_error_errno(r, "Failed to create new %s journal: %m", name);
- else
- server_add_acls(*f, uid);
+ return log_error_errno(r, "Failed to create new %s journal: %m", name);
+ }
+
+ server_add_acls(*f, uid);
return r;
}