From 102bc043bb1578d4d77a268674ce002243506df5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 22 Feb 2019 09:38:19 +0900 Subject: [PATCH] network: assign Network::manager when it is listed to the manager object. Now Network::manager is not necessary during parsing configs. C.f. 838b2f7a30dbb68f4d6939626a165b313cc94542. --- src/network/networkd-network.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 33bda6ca05e..7826ba2140c 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -314,7 +314,6 @@ int network_load_one(Manager *manager, const char *filename) { return log_oom(); *network = (Network) { - .manager = manager, .filename = TAKE_PTR(fname), .name = TAKE_PTR(name), @@ -405,15 +404,13 @@ int network_load_one(Manager *manager, const char *filename) { "CAN\0", config_item_perf_lookup, network_network_gperf_lookup, CONFIG_PARSE_WARN, network); - if (r < 0) { - /* Unset manager here. Otherwise, LIST_REMOVE() in network_free() fails. */ - network->manager = NULL; + if (r < 0) return r; - } network_apply_anonymize_if_set(network); LIST_PREPEND(networks, manager->networks, network); + network->manager = manager; r = hashmap_ensure_allocated(&manager->networks_by_name, &string_hash_ops); if (r < 0) -- 2.47.3