From: Vito Caputo <vcaputo@gnugeneration.com>
Date: Fri, 26 Aug 2016 15:51:13 +0000 (-0700)
Subject: journal: add/use flushed_flag_is_set() helper (#4041)
X-Git-Tag: v232~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6431c7e216ceb9f3cfe073c94a47ac413b892e55;p=thirdparty%2Fsystemd.git

journal: add/use flushed_flag_is_set() helper (#4041)

Minor cleanup suggested by Lennart.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ca47d64fe03..3507910919b 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -267,6 +267,10 @@ static int open_journal(
         return r;
 }
 
+static bool flushed_flag_is_set(void) {
+        return (access("/run/systemd/journal/flushed", F_OK) >= 0);
+}
+
 static int system_journal_open(Server *s, bool flush_requested) {
         bool flushed = false;
         const char *fn;
@@ -274,8 +278,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
 
         if (!s->system_journal &&
             (s->storage == STORAGE_PERSISTENT || s->storage == STORAGE_AUTO) &&
-            (flush_requested
-             || (flushed = (access("/run/systemd/journal/flushed", F_OK) >= 0)))) {
+            (flush_requested || (flushed = flushed_flag_is_set()))) {
 
                 /* If in auto mode: first try to create the machine
                  * path, but not the prefix.