diff options
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journal-send.c | 2 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index d0f3b725ff..b192f1fb88 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -439,7 +439,7 @@ _public_ int sd_journal_stream_fd(const char *identifier, int priority, int leve memcpy(header, identifier, l); header[l++] = '\n'; - header[l++] = '\n'; + header[l++] = '\n'; /* unit id */ header[l++] = '0' + priority; header[l++] = '\n'; header[l++] = '0' + !!level_prefix; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 6aff1f1ba3..56a8abea57 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -87,7 +87,7 @@ static int help(void) { " -n --lines=INTEGER Journal entries to show\n" " --no-tail Show all lines, even in follow mode\n" " -o --output=STRING Change journal output mode (short, short-monotonic,\n" - " verbose, export, json, cat)\n" + " verbose, export, json, json-pretty, cat)\n" " -q --quiet Don't show privilege warning\n" " -l --local Only local entries\n" " -b --this-boot Show data only from current boot\n" @@ -821,11 +821,6 @@ int main(int argc, char *argv[]) { on_tty(); have_pager = !arg_no_pager && !arg_follow && pager_open(); - if (arg_output == OUTPUT_JSON) { - fputc('[', stdout); - fflush(stdout); - } - for (;;) { for (;;) { sd_id128_t boot_id; @@ -874,9 +869,6 @@ int main(int argc, char *argv[]) { } } - if (arg_output == OUTPUT_JSON) - fputs("\n]\n", stdout); - finish: if (j) sd_journal_close(j); |