chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: introduce an explicit session class for cronjobs and similar
[elogind.git]
/
src
/
journal
/
test-journal-stream.c
diff --git
a/src/journal/test-journal-stream.c
b/src/journal/test-journal-stream.c
index caea2b2c6304dd6ef2408e3fdee04b4834f10e94..4b73ac79069da55c221958649c2048a812aa5628 100644
(file)
--- a/
src/journal/test-journal-stream.c
+++ b/
src/journal/test-journal-stream.c
@@
-75,8
+75,10
@@
int main(int argc, char *argv[]) {
JournalFile *one, *two, *three;
char t[] = "/tmp/journal-stream-XXXXXX";
unsigned i;
JournalFile *one, *two, *three;
char t[] = "/tmp/journal-stream-XXXXXX";
unsigned i;
- sd_journal
*j
;
+ sd_journal
_cleanup_journal_close_ *j = NULL
;
char *z;
char *z;
+ const void *data;
+ size_t l;
log_set_max_level(LOG_DEBUG);
log_set_max_level(LOG_DEBUG);
@@
-124,29
+126,23
@@
int main(int argc, char *argv[]) {
assert_se(sd_journal_add_match(j, "MAGIC=quux", 0) >= 0);
SD_JOURNAL_FOREACH_BACKWARDS(j) {
assert_se(sd_journal_add_match(j, "MAGIC=quux", 0) >= 0);
SD_JOURNAL_FOREACH_BACKWARDS(j) {
- const void *d;
- size_t l;
- char *c;
+ char _cleanup_free_ *c;
- assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0);
- printf("\t%.*s\n", (int) l, (const char*) d);
+ assert_se(sd_journal_get_data(j, "NUMBER", &d
ata
, &l) >= 0);
+ printf("\t%.*s\n", (int) l, (const char*) d
ata
);
assert_se(sd_journal_get_cursor(j, &c) >= 0);
assert_se(sd_journal_test_cursor(j, c) > 0);
assert_se(sd_journal_get_cursor(j, &c) >= 0);
assert_se(sd_journal_test_cursor(j, c) > 0);
- free(c);
}
SD_JOURNAL_FOREACH(j) {
}
SD_JOURNAL_FOREACH(j) {
- const void *d;
- size_t l;
- char *c;
+ char _cleanup_free_ *c;
- assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0);
- printf("\t%.*s\n", (int) l, (const char*) d);
+ assert_se(sd_journal_get_data(j, "NUMBER", &d
ata
, &l) >= 0);
+ printf("\t%.*s\n", (int) l, (const char*) d
ata
);
assert_se(sd_journal_get_cursor(j, &c) >= 0);
assert_se(sd_journal_test_cursor(j, c) > 0);
assert_se(sd_journal_get_cursor(j, &c) >= 0);
assert_se(sd_journal_test_cursor(j, c) > 0);
- free(c);
}
sd_journal_flush_matches(j);
}
sd_journal_flush_matches(j);
@@
-175,7
+171,9
@@
int main(int argc, char *argv[]) {
verify_contents(j, 0);
verify_contents(j, 0);
- sd_journal_close(j);
+ assert_se(sd_journal_query_unique(j, "NUMBER") >= 0);
+ SD_JOURNAL_FOREACH_UNIQUE(j, data, l)
+ printf("%.*s\n", (int) l, (const char*) data);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);