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-13 19:31:21 +0100 |
commit | 07e0ffc8234b8212a6509fe6dbc1811be03fc3ae (patch) | |
tree | c6e3c15a443bad9f9f6c9c2f220e3fa352cc0f35 /src/network | |
parent | Merge pull request #26781 from mrc0mmand/tests-again (diff) | |
download | systemd-07e0ffc8234b8212a6509fe6dbc1811be03fc3ae.tar.xz systemd-07e0ffc8234b8212a6509fe6dbc1811be03fc3ae.zip |
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/network')
-rw-r--r-- | src/network/networkd-conf.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c index f73b2d43c7..063732a3b4 100644 --- a/src/network/networkd-conf.c +++ b/src/network/networkd-conf.c @@ -14,17 +14,14 @@ int manager_parse_config_file(Manager *m) { assert(m); - r = config_parse_many_nulstr( - PKGSYSCONFDIR "/networkd.conf", - CONF_PATHS_NULSTR("systemd/networkd.conf.d"), - "Network\0" - "DHCPv4\0" - "DHCPv6\0" - "DHCP\0", - config_item_perf_lookup, networkd_gperf_lookup, - CONFIG_PARSE_WARN, - m, - NULL); + r = config_parse_config_file("networkd.conf", + "Network\0" + "DHCPv4\0" + "DHCPv6\0" + "DHCP\0", + config_item_perf_lookup, networkd_gperf_lookup, + CONFIG_PARSE_WARN, + m); if (r < 0) return r; |