X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.h;fp=src%2Fjournal%2Fsd-journal.h;h=bf6673453dbe31f9656c5c7c507b66abdf912f4a;hp=6b451b57657c7c4802da839dcbc7912299b445f7;hb=8725d60ae4f7a8471aa8a0207fa105e335d069a6;hpb=e892bd1797e99c8afaa6afdbe413fda78937c9c3

diff --git a/src/journal/sd-journal.h b/src/journal/sd-journal.h
index 6b451b576..bf6673453 100644
--- a/src/journal/sd-journal.h
+++ b/src/journal/sd-journal.h
@@ -49,8 +49,9 @@ int sd_journal_next(sd_journal *j);
 
 int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret);
 int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret);
-int sd_journal_get_field(sd_journal *j, const char *field, const void **data, size_t *l);
-int sd_journal_iterate_fields(sd_journal *j, const void **data, size_t *l);
+int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l);
+int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l);
+void sd_journal_start_data(sd_journal *j);
 
 int sd_journal_add_match(sd_journal *j, const void *data, size_t size);
 void sd_journal_flush_matches(sd_journal *j);
@@ -58,13 +59,16 @@ void sd_journal_flush_matches(sd_journal *j);
 int sd_journal_seek_head(sd_journal *j);
 int sd_journal_seek_tail(sd_journal *j);
 
-int sd_journal_seek_monotonic_usec(sd_journal *j, uint64_t usec);
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);
+int sd_journal_seek_monotonic_usec(sd_journal *j, uint64_t usec);  /* missing */
+int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);   /* missing */
 
 int sd_journal_get_cursor(sd_journal *j, char **cursor);
-int sd_journal_set_cursor(sd_journal *j, const char *cursor);
+int sd_journal_set_cursor(sd_journal *j, const char *cursor);      /* missing */
 
-int sd_journal_get_fd(sd_journal *j);
+int sd_journal_unique_seek(sd_journal *j, const char *field);      /* missing */
+int sd_journal_unique_enumerate(sd_journal *j, const void **data, size_t *l); /* missing */
+
+int sd_journal_get_fd(sd_journal *j);                              /* missing */
 
 enum {
         SD_JOURNAL_NOP,
@@ -74,13 +78,28 @@ enum {
 
 int sd_journal_process(sd_journal *j);
 
-#define SD_JOURNAL_FOREACH(j)                   \
-        while (sd_journal_next(j) > 0)
+#define SD_JOURNAL_FOREACH_BEGIN(j)             \
+        if (sd_journal_seek_head(j) > 0) do {
+
+#define SD_JOURNAL_FOREACH_END(j)               \
+        } while (sd_journal_next(j) > 0)
+
+#define SD_JOURNAL_FOREACH_CONTINUE(j)          \
+        do {
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_BEGIN(j)   \
+        if (sd_journal_seek_tail(j) > 0) do {
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_END(j)     \
+        } while (sd_journal_previous(j) > 0)
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_CONTINUE(j) \
+        do {
 
-#define SD_JOURNAL_FOREACH_BACKWARDS(j)         \
-        while (sd_journal_previous(j) > 0)
+#define SD_JOURNAL_FOREACH_DATA(j, data, l)                             \
+        for (sd_journal_start_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
 
-#define SD_JOURNAL_FOREACH_FIELD(j, data, l)                            \
-        while (sd_journal_iterate_fields((j), &(data), &(l)) > 0)
+#define SD_JOURNAL_FOREACH_UNIQUE(j, data, l)                      \
+        while (sd_journal_enumerate_unique_data((j), &(data), &(l)) > 0)
 
 #endif