X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Flogs-show.c;h=b7a99d2c23118e5b755277e4f4a664f346de95bb;hp=dff0d30d71b2378ead6918448d53c6e2ac771660;hb=3c7560019e623e6e0d03a860b4f19a3a8715feca;hpb=3a8d368a6184ca8b7422330b53513983088671f2 diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index dff0d30d7..b7a99d2c2 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1234,12 +1234,12 @@ int show_journal_by_unit( unsigned how_many, uid_t uid, OutputFlags flags, - bool system, + int journal_open_flags, + bool system_unit, bool *ellipsized) { _cleanup_journal_close_ sd_journal*j = NULL; int r; - int jflags = SD_JOURNAL_LOCAL_ONLY | system * SD_JOURNAL_SYSTEM; assert(mode >= 0); assert(mode < _OUTPUT_MODE_MAX); @@ -1248,7 +1248,7 @@ int show_journal_by_unit( if (how_many <= 0) return 0; - r = sd_journal_open(&j, jflags); + r = sd_journal_open(&j, journal_open_flags); if (r < 0) return r; @@ -1256,7 +1256,7 @@ int show_journal_by_unit( if (r < 0) return r; - if (system) + if (system_unit) r = add_matches_for_unit(j, unit); else r = add_matches_for_user_unit(j, unit, uid);