summaryrefslogtreecommitdiff
path: root/src/journal/journald-server.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-10-20 10:31:38 +0200
committerDaniel Mack <github@zonque.org>2015-10-20 10:31:38 +0200
commit824b35c3859bc99b97ac5fa6e09aa34627e9bcd5 (patch)
tree266c8f9988ba8d1cab00a55b360b3f2e42096dde /src/journal/journald-server.c
parentec566e4c7cee67ec2c39475ef08f18a9f1b80efd (diff)
parent2229f656677f0d50c507aec40cda59f66da5c949 (diff)
Merge pull request #1568 from poettering/netclass
various fixes, for various things
Diffstat (limited to 'src/journal/journald-server.c')
-rw-r--r--src/journal/journald-server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 2d2a215f5d..140d40667e 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -930,7 +930,7 @@ finish:
static int system_journal_open(Server *s, bool flush_requested) {
const char *fn;
- int r;
+ int r = 0;
if (!s->system_journal &&
(s->storage == STORAGE_PERSISTENT || s->storage == STORAGE_AUTO) &&
@@ -1231,7 +1231,7 @@ static int dispatch_sigusr1(sd_event_source *es, const struct signalfd_siginfo *
server_sync(s);
server_vacuum(s, false, false);
- touch("/run/systemd/journal/flushed");
+ (void) touch("/run/systemd/journal/flushed");
return 0;
}