diff options
| -rw-r--r-- | src/journal/journal-file.h | 1 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index cd8a48a364..6a44fd39d2 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -144,6 +144,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 31a7b5ff03..90c146dc67 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -253,8 +253,9 @@ static int open_journal( bool seal, JournalMetrics *metrics, JournalFile **ret) { + + _cleanup_(journal_file_closep) JournalFile *f = NULL; int r; - JournalFile *f; assert(s); assert(fname); @@ -271,12 +272,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; } |