diff options
author | Franck Bui <fbui@suse.com> | 2023-01-27 11:32:27 +0100 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-14 03:31:21 +0900 |
commit | 07e0ffc8234b8212a6509fe6dbc1811be03fc3ae (patch) | |
tree | c6e3c15a443bad9f9f6c9c2f220e3fa352cc0f35 /src/journal-remote/journal-upload.c | |
parent | 4fed028ae48e0b70325d78dd7e44e7f776a7aa0a (diff) | |
download | systemd-07e0ffc8234b8212a6509fe6dbc1811be03fc3ae.tar.gz |
conf: replace config_parse_many_nulstr() with config_parse_config_file()
All daemons use a similar scheme to read their main config files and theirs
drop-ins. The main config files are always stored in /etc/systemd directory and
it's easy enough to construct the name of the drop-in directories based on the
name of the main config file.
Hence the new helper does that internally, which allows to reduce and simplify
the args passed previously to config_parse_many_nulstr().
Besides the overall code simplification it results:
16 files changed, 87 insertions(+), 159 deletions(-)
it allows to identify clearly the locations in the code where configuration
files are parsed.
Diffstat (limited to 'src/journal-remote/journal-upload.c')
-rw-r--r-- | src/journal-remote/journal-upload.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index fc55f13bab..e42516c799 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -568,14 +568,9 @@ static int parse_config(void) { {} }; - return config_parse_many_nulstr( - PKGSYSCONFDIR "/journal-upload.conf", - CONF_PATHS_NULSTR("systemd/journal-upload.conf.d"), - "Upload\0", - config_item_table_lookup, items, - CONFIG_PARSE_WARN, - NULL, - NULL); + return config_parse_config_file("journal-upload.conf", "Upload\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, NULL); } static int help(void) { |