chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
list: properly skip over first item in LIST_FOREACH_OTHERS
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 98972eda3b08ef977ef245f6f2e8f868967c9f65..b7a99d2c23118e5b755277e4f4a664f346de95bb 100644
(file)
--- 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,
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;
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);
assert(mode >= 0);
assert(mode < _OUTPUT_MODE_MAX);
@@
-1248,7
+1248,7
@@
int show_journal_by_unit(
if (how_many <= 0)
return 0;
if (how_many <= 0)
return 0;
- r = sd_journal_open(&j, jflags);
+ r = sd_journal_open(&j, j
ournal_open_
flags);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1256,14
+1256,14
@@
int show_journal_by_unit(
if (r < 0)
return r;
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);
if (r < 0)
return r;
r = add_matches_for_unit(j, unit);
else
r = add_matches_for_user_unit(j, unit, uid);
if (r < 0)
return r;
- if (_unlikely_(log_get_max_level() >= LOG_
PRI(LOG_DEBUG)
)) {
+ if (_unlikely_(log_get_max_level() >= LOG_
DEBUG
)) {
_cleanup_free_ char *filter;
filter = journal_make_match_string(j);
_cleanup_free_ char *filter;
filter = journal_make_match_string(j);