X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flogs-show.h;h=6c32aa7a7277ce7a0efa01b0c1e491b5ba47d834;hb=74051b9b5865586bf4d30b9075649af838fb92bd;hp=ea0f51fbf048c147366fdd3206dfb135f9e31622;hpb=08ace05beb1d09b6ebc5e9cafc2b972b39fa2437;p=elogind.git

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index ea0f51fbf..6c32aa7a7 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -26,26 +26,7 @@
 #include <systemd/sd-journal.h>
 
 #include "util.h"
-
-typedef enum OutputMode {
-        OUTPUT_SHORT,
-        OUTPUT_SHORT_MONOTONIC,
-        OUTPUT_VERBOSE,
-        OUTPUT_EXPORT,
-        OUTPUT_JSON,
-        OUTPUT_JSON_PRETTY,
-        OUTPUT_CAT,
-        _OUTPUT_MODE_MAX,
-        _OUTPUT_MODE_INVALID = -1
-} OutputMode;
-
-typedef enum OutputFlags {
-        OUTPUT_SHOW_ALL       = 1 << 0,
-        OUTPUT_FOLLOW         = 1 << 1,
-        OUTPUT_WARN_CUTOFF    = 1 << 2,
-        OUTPUT_FULL_WIDTH     = 1 << 3,
-        OUTPUT_COLOR          = 1 << 4
-} OutputFlags;
+#include "output-mode.h"
 
 int output_journal(
                 FILE *f,
@@ -63,5 +44,11 @@ int show_journal_by_unit(
                 unsigned how_many,
                 OutputFlags flags);
 
+void json_escape(
+                FILE *f,
+                const char* p,
+                size_t l,
+                OutputFlags flags);
+
 const char* output_mode_to_string(OutputMode m);
 OutputMode output_mode_from_string(const char *s);