X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-internal.h;h=2c401e3083d0fde852b7bb482f31060d4951bf94;hb=322345fdb9865ef2477fba8e4bdde0e1183ef505;hp=5bc653537c0a53c10570df8538904c955321813f;hpb=a65f06bb27688a6738f2f94b7f055f4c66768d63;p=elogind.git

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 5bc653537..2c401e308 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -98,6 +98,7 @@ struct Directory {
 
 struct sd_journal {
         char *path;
+        char *prefix;
 
         Hashmap *files;
         MMapCache *mmap;
@@ -135,11 +136,8 @@ struct sd_journal {
 char *journal_make_match_string(sd_journal *j);
 void journal_print_header(sd_journal *j);
 
-static inline void journal_closep(sd_journal **j) {
-        sd_journal_close(*j);
-}
-
-#define _cleanup_journal_close_ _cleanup_(journal_closep)
+DEFINE_TRIVIAL_CLEANUP_FUNC(sd_journal*, sd_journal_close);
+#define _cleanup_journal_close_ _cleanup_(sd_journal_closep)
 
 #define JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval)                     \
         for (sd_journal_restart_data(j); ((retval) = sd_journal_enumerate_data((j), &(data), &(l))) > 0; )