From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 28 May 2019 09:07:01 +0000 (+0900)
Subject: journal: use cleanup attribute at one more place
X-Git-Tag: v243-rc1~367^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=627df1dc42b68a74b0882b06366d1185b1a34332;p=thirdparty%2Fsystemd.git

journal: use cleanup attribute at one more place
---

diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index e1ea3689991..502f1f567d1 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -145,6 +145,7 @@ int journal_file_open(
 int journal_file_set_offline(JournalFile *f, bool wait);
 bool journal_file_is_offlining(JournalFile *f);
 JournalFile* journal_file_close(JournalFile *j);
+DEFINE_TRIVIAL_CLEANUP_FUNC(JournalFile*, journal_file_close);
 
 int journal_file_open_reliably(
                 const char *fname,
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index b2638c09b35..2a4fc250c91 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -255,7 +255,7 @@ static int open_journal(
                 JournalMetrics *metrics,
                 JournalFile **ret) {
 
-        JournalFile *f;
+        _cleanup_(journal_file_closep) JournalFile *f = NULL;
         int r;
 
         assert(s);
@@ -273,12 +273,10 @@ static int open_journal(
                 return r;
 
         r = journal_file_enable_post_change_timer(f, s->event, POST_CHANGE_TIMER_INTERVAL_USEC);
-        if (r < 0) {
-                (void) journal_file_close(f);
+        if (r < 0)
                 return r;
-        }
 
-        *ret = f;
+        *ret = TAKE_PTR(f);
         return r;
 }