journalctl: fix verbose output when no logs are found

[elogind.git] / src / journal / journal-internal.h

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index f68ca996a83b793bc61a6ef337a2399f6f5a0b43..f576a0073d905b18b0d596f919bd630bcb15bfdb 100644 (file)
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -30,6 +30,7 @@
 #include "journal-def.h"
 #include "list.h"
 #include "hashmap.h"
 #include "journal-def.h"
 #include "list.h"
 #include "hashmap.h"

+#include "set.h"

 #include "journal-file.h"
 
 typedef struct Match Match;
 #include "journal-file.h"
 
 typedef struct Match Match;


@@ -73,19 +74,20 @@ typedef enum LocationType {
 struct Location {
         LocationType type;
 
 struct Location {
         LocationType type;
 

+        bool seqnum_set;
+        bool realtime_set;
+        bool monotonic_set;
+        bool xor_hash_set;
+

         uint64_t seqnum;
         sd_id128_t seqnum_id;
         uint64_t seqnum;
         sd_id128_t seqnum_id;

-        bool seqnum_set;

 
         uint64_t realtime;
 
         uint64_t realtime;

-        bool realtime_set;

 
         uint64_t monotonic;
         sd_id128_t boot_id;
 
         uint64_t monotonic;
         sd_id128_t boot_id;

-        bool monotonic_set;

 
         uint64_t xor_hash;
 
         uint64_t xor_hash;

-        bool xor_hash_set;

 };
 
 struct Directory {
 };
 
 struct Directory {


@@ -112,14 +114,31 @@ struct sd_journal {
 
         int inotify_fd;
 
 
         int inotify_fd;
 

-        Match *level0, *level1;
+        Match *level0, *level1, *level2;

 
         unsigned current_invalidate_counter, last_invalidate_counter;
 
         char *unique_field;
         JournalFile *unique_file;
         uint64_t unique_offset;
 
         unsigned current_invalidate_counter, last_invalidate_counter;
 
         char *unique_field;
         JournalFile *unique_file;
         uint64_t unique_offset;

+
+        bool on_network;
+
+        size_t data_threshold;
+
+        Set *errors;
+
+        usec_t last_process_usec;

 };
 
 char *journal_make_match_string(sd_journal *j);
 void journal_print_header(sd_journal *j);
 };
 
 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 JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval)                     \
+        for (sd_journal_restart_data(j); ((retval) = sd_journal_enumerate_data((j), &(data), &(l))) > 0; )