27f31daf3e
As of the commit aae9a96d4b
removing --follow
option in systemctl command, OUTPUT_FOLLOW has never been set anywhere. Let's
remove it.
The condition expression of the if-statement in show_journal() that refers to
OUTPUT_FOLLOW now thus evaluates always to true. Hence, the call of
sd_journal_wait() is in dead code, and the outer infinite for-loop is
meaningless, which we remove as cleanup.
There is no functional change by this commit.
50 lines
1.5 KiB
C
50 lines
1.5 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
#include "json.h"
|
|
#include "macro.h"
|
|
|
|
typedef enum OutputMode {
|
|
OUTPUT_SHORT,
|
|
OUTPUT_SHORT_FULL,
|
|
OUTPUT_SHORT_ISO,
|
|
OUTPUT_SHORT_ISO_PRECISE,
|
|
OUTPUT_SHORT_PRECISE,
|
|
OUTPUT_SHORT_MONOTONIC,
|
|
OUTPUT_SHORT_UNIX,
|
|
OUTPUT_VERBOSE,
|
|
OUTPUT_EXPORT,
|
|
OUTPUT_JSON,
|
|
OUTPUT_JSON_PRETTY,
|
|
OUTPUT_JSON_SSE,
|
|
OUTPUT_JSON_SEQ,
|
|
OUTPUT_CAT,
|
|
OUTPUT_WITH_UNIT,
|
|
_OUTPUT_MODE_MAX,
|
|
_OUTPUT_MODE_INVALID = -1
|
|
} OutputMode;
|
|
|
|
static inline bool OUTPUT_MODE_IS_JSON(OutputMode m) {
|
|
return IN_SET(m, OUTPUT_JSON, OUTPUT_JSON_PRETTY, OUTPUT_JSON_SSE, OUTPUT_JSON_SEQ);
|
|
}
|
|
|
|
/* The output flags definitions are shared by the logs and process tree output. Some apply to both, some only to the
|
|
* logs output, others only to the process tree output. */
|
|
|
|
typedef enum OutputFlags {
|
|
OUTPUT_SHOW_ALL = 1 << 0,
|
|
OUTPUT_WARN_CUTOFF = 1 << 1,
|
|
OUTPUT_FULL_WIDTH = 1 << 2,
|
|
OUTPUT_COLOR = 1 << 3,
|
|
OUTPUT_CATALOG = 1 << 4,
|
|
OUTPUT_BEGIN_NEWLINE = 1 << 5,
|
|
OUTPUT_UTC = 1 << 6,
|
|
OUTPUT_KERNEL_THREADS = 1 << 7,
|
|
OUTPUT_NO_HOSTNAME = 1 << 8,
|
|
} OutputFlags;
|
|
|
|
JsonFormatFlags output_mode_to_json_format_flags(OutputMode m);
|
|
|
|
const char* output_mode_to_string(OutputMode m) _const_;
|
|
OutputMode output_mode_from_string(const char *s) _pure_;
|