mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
shared: move output_mode_to_string() into output-mode.c
After all, the enum definition is in output-mode.h
This commit is contained in:
parent
03532f0ae0
commit
766cd08152
@ -962,6 +962,7 @@ noinst_LTLIBRARIES += \
|
||||
|
||||
libshared_la_SOURCES = \
|
||||
src/shared/output-mode.h \
|
||||
src/shared/output-mode.c \
|
||||
src/shared/gpt.h \
|
||||
src/shared/udev-util.h \
|
||||
src/shared/linux/auto_dev-ioctl.h \
|
||||
|
@ -1292,18 +1292,3 @@ int show_journal_by_unit(
|
||||
|
||||
return show_journal(f, j, mode, n_columns, not_before, how_many, flags, ellipsized);
|
||||
}
|
||||
|
||||
static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
|
||||
[OUTPUT_SHORT] = "short",
|
||||
[OUTPUT_SHORT_ISO] = "short-iso",
|
||||
[OUTPUT_SHORT_PRECISE] = "short-precise",
|
||||
[OUTPUT_SHORT_MONOTONIC] = "short-monotonic",
|
||||
[OUTPUT_VERBOSE] = "verbose",
|
||||
[OUTPUT_EXPORT] = "export",
|
||||
[OUTPUT_JSON] = "json",
|
||||
[OUTPUT_JSON_PRETTY] = "json-pretty",
|
||||
[OUTPUT_JSON_SSE] = "json-sse",
|
||||
[OUTPUT_CAT] = "cat"
|
||||
};
|
||||
|
||||
DEFINE_STRING_TABLE_LOOKUP(output_mode, OutputMode);
|
||||
|
@ -68,6 +68,3 @@ void json_escape(
|
||||
const char* p,
|
||||
size_t l,
|
||||
OutputFlags flags);
|
||||
|
||||
const char* output_mode_to_string(OutputMode m) _const_;
|
||||
OutputMode output_mode_from_string(const char *s) _pure_;
|
||||
|
36
src/shared/output-mode.c
Normal file
36
src/shared/output-mode.c
Normal file
@ -0,0 +1,36 @@
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2012 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "output-mode.h"
|
||||
#include "string-table.h"
|
||||
|
||||
static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
|
||||
[OUTPUT_SHORT] = "short",
|
||||
[OUTPUT_SHORT_ISO] = "short-iso",
|
||||
[OUTPUT_SHORT_PRECISE] = "short-precise",
|
||||
[OUTPUT_SHORT_MONOTONIC] = "short-monotonic",
|
||||
[OUTPUT_VERBOSE] = "verbose",
|
||||
[OUTPUT_EXPORT] = "export",
|
||||
[OUTPUT_JSON] = "json",
|
||||
[OUTPUT_JSON_PRETTY] = "json-pretty",
|
||||
[OUTPUT_JSON_SSE] = "json-sse",
|
||||
[OUTPUT_CAT] = "cat"
|
||||
};
|
||||
|
||||
DEFINE_STRING_TABLE_LOOKUP(output_mode, OutputMode);
|
@ -19,6 +19,8 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
typedef enum OutputMode {
|
||||
OUTPUT_SHORT,
|
||||
OUTPUT_SHORT_ISO,
|
||||
@ -48,3 +50,6 @@ typedef enum OutputFlags {
|
||||
OUTPUT_UTC = 1 << 7,
|
||||
OUTPUT_KERNEL_THREADS = 1 << 8,
|
||||
} OutputFlags;
|
||||
|
||||
const char* output_mode_to_string(OutputMode m) _const_;
|
||||
OutputMode output_mode_from_string(const char *s) _pure_;
|
||||
|
Loading…
Reference in New Issue
Block a user