summaryrefslogtreecommitdiff
path: root/src/journal/journalctl.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-03-29 00:37:25 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-15 22:23:48 -0400
commiteacbb4d33e2bb5c54311544851140efe3dd0f774 (patch)
treedefb38ea173f0ee691862d1af9000a7e74303d7f /src/journal/journalctl.c
parent7449bc1f34c206e3ff8e274cd74e2db950d492a1 (diff)
journal-upload: use journal as the source
Diffstat (limited to 'src/journal/journalctl.c')
-rw-r--r--src/journal/journalctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 86453e65c8..92e8286334 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -167,8 +167,8 @@ static int help(void) {
printf("%s [OPTIONS...] [MATCHES...]\n\n"
"Query the journal.\n\n"
"Flags:\n"
- " --system Show only the system journal\n"
- " --user Show only the user journal for the current user\n"
+ " --system Show the system journal\n"
+ " --user Show the user journal for the current user\n"
" -M --machine=CONTAINER Operate on local container\n"
" --since=DATE Start showing entries on or newer than the specified date\n"
" --until=DATE Stop showing entries on or older than the specified date\n"
@@ -1752,7 +1752,7 @@ int main(int argc, char *argv[]) {
}
if (arg_cursor || arg_after_cursor) {
- r = sd_journal_seek_cursor(j, arg_cursor ? arg_cursor : arg_after_cursor);
+ r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor);
if (r < 0) {
log_error("Failed to seek to cursor: %s", strerror(-r));
return EXIT_FAILURE;