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

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 5bc653537..e591fb61f 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <systemd/sd-id128.h>
+#include "systemd/sd-id128.h"
 
 #include "journal-def.h"
 #include "list.h"
@@ -98,6 +98,7 @@ struct Directory {
 
 struct sd_journal {
         char *path;
+        char *prefix;
 
         Hashmap *files;
         MMapCache *mmap;
@@ -123,6 +124,10 @@ struct sd_journal {
 
         bool on_network;
         bool no_new_files;
+        bool unique_file_lost; /* File we were iterating over got
+                                  removed, and there were no more
+                                  files, so sd_j_enumerate_unique
+                                  will return a value equal to 0. */
 
         size_t data_threshold;
 
@@ -135,11 +140,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; )