X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-internal.h;h=d17fdb2e92a596606090613c3e09a5e8e70cfac0;hb=85e9a1010d16064ce435b84f02dc585bc645aade;hp=929dfcdcb8fc09af2b521c1110af358b89ea71a5;hpb=a963990ff4ebc7908d3cf82bbd8cf34a42d57b7f;p=elogind.git

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 929dfcdcb..d17fdb2e9 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foojournalinternalhfoo
-#define foojournalinternalhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -28,28 +27,43 @@
 
 #include <systemd/sd-id128.h>
 
+#include "journal-def.h"
 #include "list.h"
+#include "hashmap.h"
+#include "journal-file.h"
 
 typedef struct Match Match;
 typedef struct Location Location;
 typedef struct Directory Directory;
 
-typedef enum location_type {
-        LOCATION_HEAD,
-        LOCATION_TAIL,
-        LOCATION_DISCRETE
-} location_type_t;
+typedef enum MatchType {
+        MATCH_DISCRETE,
+        MATCH_OR_TERM,
+        MATCH_AND_TERM
+} MatchType;
 
 struct Match {
+        MatchType type;
+        Match *parent;
+        LIST_FIELDS(Match, matches);
+
+        /* For concrete matches */
         char *data;
         size_t size;
         le64_t le_hash;
 
-        LIST_FIELDS(Match, matches);
+        /* For terms */
+        LIST_HEAD(Match, matches);
 };
 
+typedef enum LocationType {
+        LOCATION_HEAD,
+        LOCATION_TAIL,
+        LOCATION_DISCRETE
+} LocationType;
+
 struct Location {
-        location_type_t type;
+        LocationType type;
 
         uint64_t seqnum;
         sd_id128_t seqnum_id;
@@ -75,9 +89,12 @@ struct Directory {
 struct sd_journal {
         int flags;
 
+        char *path;
+
         Hashmap *files;
 
         Location current_location;
+
         JournalFile *current_file;
         uint64_t current_field;
 
@@ -86,10 +103,11 @@ struct sd_journal {
 
         int inotify_fd;
 
-        LIST_HEAD(Match, matches);
-        unsigned n_matches;
+        Match *level0, *level1;
 
         unsigned current_invalidate_counter, last_invalidate_counter;
 };
 
-#endif
+char *journal_make_match_string(sd_journal *j);
+void journal_print_header(sd_journal *j);
+