summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-05-22 16:14:49 +0200
committerGitHub <noreply@github.com>2018-05-22 16:14:49 +0200
commit8904ab86b0397e64846e4b7418584f7120626d9f (patch)
treead6c3ef887dd1019933b618a1194a6db699245a2 /src/journal
parent52d2566ac73e33193259390483799064c2d070bf (diff)
parent5f92e51763663021d36e07c7ca55377cd054f477 (diff)
downloadsystemd-8904ab86b0397e64846e4b7418584f7120626d9f.tar.gz
Merge pull request #9062 from poettering/parse-conf-macro
add new CONFIG_PARSER_PROTOTYPE() macro
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald-server.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 6d01b2da3d..2728ac1169 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -14,6 +14,7 @@
typedef struct Server Server;
+#include "conf-parser.h"
#include "hashmap.h"
#include "journal-file.h"
#include "journald-context.h"
@@ -195,14 +196,14 @@ void server_driver_message(Server *s, pid_t object_pid, const char *message_id,
/* gperf lookup function */
const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_line_max(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_compress(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+CONFIG_PARSER_PROTOTYPE(config_parse_storage);
+CONFIG_PARSER_PROTOTYPE(config_parse_line_max);
+CONFIG_PARSER_PROTOTYPE(config_parse_compress);
const char *storage_to_string(Storage s) _const_;
Storage storage_from_string(const char *s) _pure_;
-int config_parse_split_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+CONFIG_PARSER_PROTOTYPE(config_parse_split_mode);
const char *split_mode_to_string(SplitMode s) _const_;
SplitMode split_mode_from_string(const char *s) _pure_;