diff options
Diffstat (limited to 'src/journal/journalctl.c')
| -rw-r--r-- | src/journal/journalctl.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index c9b2abecea..2ebac405c2 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -604,6 +604,10 @@ static int add_this_boot(sd_journal *j) { return r; } + r = sd_journal_add_conjunction(j); + if (r < 0) + return r; + return 0; } @@ -627,13 +631,16 @@ static int add_unit(sd_journal *j) { if (r < 0) return r; + r = sd_journal_add_conjunction(j); + if (r < 0) + return r; + return 0; } static int add_priorities(sd_journal *j) { char match[] = "PRIORITY=0"; int i, r; - assert(j); if (arg_priorities == 0xFF) @@ -650,6 +657,10 @@ static int add_priorities(sd_journal *j) { } } + r = sd_journal_add_conjunction(j); + if (r < 0) + return r; + return 0; } @@ -1106,11 +1117,11 @@ int main(int argc, char *argv[]) { if (r < 0) return EXIT_FAILURE; - r = add_matches(j, argv + optind); + r = add_priorities(j); if (r < 0) return EXIT_FAILURE; - r = add_priorities(j); + r = add_matches(j, argv + optind); if (r < 0) return EXIT_FAILURE; |