diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-09-10 11:02:40 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-09-16 10:32:03 -0400 |
| commit | 43688c49d1fdb585196d94e2e30bb29755fa591b (patch) | |
| tree | 428e20a228264ae8326bcbf4cfe42187b681e489 /src/network | |
| parent | 047a0dacde06740050858d72c385cc07a4091feb (diff) | |
tree-wide: rename config_parse_many to …_nulstr
In preparation for adding a version which takes a strv.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-conf.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c index c03e2b2ebf..49bb8c18f6 100644 --- a/src/network/networkd-conf.c +++ b/src/network/networkd-conf.c @@ -29,7 +29,7 @@ int manager_parse_config_file(Manager *m) { assert(m); - return config_parse_many(PKGSYSCONFDIR "/networkd.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/networkd.conf", CONF_PATHS_NULSTR("systemd/networkd.conf.d"), "DHCP\0", config_item_perf_lookup, networkd_gperf_lookup, diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 0b36f13be8..1ce23b1ddb 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -151,7 +151,7 @@ static int network_load_one(Manager *manager, const char *filename) { if (r < 0) return r; - r = config_parse_many(filename, dropin_dirs_nulstr, + r = config_parse_many_nulstr(filename, dropin_dirs_nulstr, "Match\0" "Link\0" "Network\0" |