chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: StartTransientUnit can have aux unit
[elogind.git]
/
src
/
journal
/
journal-internal.h
diff --git
a/src/journal/journal-internal.h
b/src/journal/journal-internal.h
index 5bc653537c0a53c10570df8538904c955321813f..70847db0bfd25e74cd4e3b94d71fef8a52886f21 100644
(file)
--- a/
src/journal/journal-internal.h
+++ b/
src/journal/journal-internal.h
@@
-25,7
+25,7
@@
#include <inttypes.h>
#include <stdbool.h>
#include <inttypes.h>
#include <stdbool.h>
-#include
<systemd/sd-id128.h>
+#include
"systemd/sd-id128.h"
#include "journal-def.h"
#include "list.h"
#include "journal-def.h"
#include "list.h"
@@
-98,8
+98,9
@@
struct Directory {
struct sd_journal {
char *path;
struct sd_journal {
char *path;
+ char *prefix;
- Hashmap *files;
+
Ordered
Hashmap *files;
MMapCache *mmap;
Location current_location;
MMapCache *mmap;
Location current_location;
@@
-123,6
+124,10
@@
struct sd_journal {
bool on_network;
bool no_new_files;
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;
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);
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; )
#define JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval) \
for (sd_journal_restart_data(j); ((retval) = sd_journal_enumerate_data((j), &(data), &(l))) > 0; )