X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flogs-show.h;h=3e6b6e0f643edebb29fc602a7cc36050eb6b6dcf;hb=b5b46d599524341ddd7407e5dff1021af8ff5089;hp=44afaf306a17659abc84d50bed979aee38a31272;hpb=085d71209ba32c1e4e72ec031536be892054352e;p=elogind.git

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 44afaf306..3e6b6e0f6 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologsshowhfoo
-#define foologsshowhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -34,16 +33,18 @@ typedef enum OutputMode {
         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_MONOTONIC_MODE = 1 << 1,
-        OUTPUT_FOLLOW = 1 << 2,
-        OUTPUT_WARN_CUTOFF = 1 << 3,
+        OUTPUT_SHOW_ALL       = 1 << 0,
+        OUTPUT_FOLLOW         = 1 << 1,
+        OUTPUT_WARN_CUTOFF    = 1 << 2,
+        OUTPUT_FULL_WIDTH     = 1 << 3,
+        OUTPUT_COLOR          = 1 << 4
 } OutputFlags;
 
 int output_journal(sd_journal *j, OutputMode mode, unsigned line,
@@ -59,5 +60,3 @@ int show_journal_by_unit(
 
 const char* output_mode_to_string(OutputMode m);
 OutputMode output_mode_from_string(const char *s);
-
-#endif