X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flogs-show.h;h=c9a9ad3e9195413239bc3b062d031aa4c3c3c601;hb=b32ff512191bf873266ee8067f6f6c8a30c96a5e;hp=2e9cf63891ba887501467c9e9dd0358a4c4eaeb5;hpb=92a1fd9e95954a557d6fe27b56f5ef1b89fc2f5e;p=elogind.git

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 2e9cf6389..c9a9ad3e9 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.
@@ -23,42 +22,48 @@
 ***/
 
 #include <stdbool.h>
+#include <unistd.h>
+#include <sys/types.h>
 
 #include <systemd/sd-journal.h>
 
 #include "util.h"
+#include "output-mode.h"
 
-typedef enum OutputMode {
-        OUTPUT_SHORT,
-        OUTPUT_SHORT_MONOTONIC,
-        OUTPUT_VERBOSE,
-        OUTPUT_EXPORT,
-        OUTPUT_JSON,
-        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_FULL_WIDTH = 1 << 4,
-} OutputFlags;
-
-int output_journal(sd_journal *j, OutputMode mode, unsigned line,
-                   unsigned n_columns, OutputFlags flags);
+int output_journal(
+                FILE *f,
+                sd_journal *j,
+                OutputMode mode,
+                unsigned n_columns,
+                OutputFlags flags);
+
+int add_match_this_boot(sd_journal *j);
+
+int add_matches_for_unit(
+                sd_journal *j,
+                const char *unit);
+
+int add_matches_for_user_unit(
+                sd_journal *j,
+                const char *unit,
+                uid_t uid);
 
 int show_journal_by_unit(
+                FILE *f,
                 const char *unit,
                 OutputMode mode,
                 unsigned n_columns,
                 usec_t not_before,
                 unsigned how_many,
-                OutputFlags flags);
+                uid_t uid,
+                OutputFlags flags,
+                bool system);
 
-const char* output_mode_to_string(OutputMode m);
-OutputMode output_mode_from_string(const char *s);
+void json_escape(
+                FILE *f,
+                const char* p,
+                size_t l,
+                OutputFlags flags);
 
-#endif
+const char* output_mode_to_string(OutputMode m) _const_;
+OutputMode output_mode_from_string(const char *s) _pure_;