journal: unify code for up and for down traversal

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

diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 4665f4da380076ff48c0e8eef422913edbab4ea6..795a446dc8dc636e7408315a07a5c70cbf5cb194 100644 (file)
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -54,16 +54,10 @@ typedef struct JournalFile {
         uint64_t current_offset;
 } JournalFile;
 
-typedef struct JournalCursor {
-        uint8_t version;
-        uint8_t reserved[7];
-        uint64_t seqnum;
-        sd_id128_t seqnum_id;
-        sd_id128_t boot_id;
-        uint64_t monotonic;
-        uint64_t realtime;
-        uint64_t xor_hash;
-} JournalCursor;
+typedef enum direction {
+        DIRECTION_UP,
+        DIRECTION_DOWN
+} direction_t;
 
 int journal_file_open(const char *fname, int flags, mode_t mode, JournalFile *template, JournalFile **ret);
 
@@ -73,15 +67,13 @@ int journal_file_move_to_object(JournalFile *f, uint64_t offset, int type, Objec
 
 uint64_t journal_file_entry_n_items(Object *o);
 
-int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, Object **ret, uint64_t *offset);
+int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset);
 
 int journal_file_move_to_entry(JournalFile *f, uint64_t seqnum, Object **ret, uint64_t *offset);
 
-int journal_file_find_first_entry(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset);
-int journal_file_find_last_entry(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset);
+int journal_file_find_first_entry(JournalFile *f, const void *data, uint64_t size, direction_t direction, Object **ret, uint64_t *offset);
 
-int journal_file_next_entry(JournalFile *f, Object *o, Object **ret, uint64_t *offset);
-int journal_file_prev_entry(JournalFile *f, Object *o, Object **ret, uint64_t *offset);
+int journal_file_next_entry(JournalFile *f, Object *o, direction_t direction, Object **ret, uint64_t *offset);
 
 void journal_file_dump(JournalFile *f);