network: use hashmap_free_with_destructor() in network_free()

2018-11-11 11:36:16 +09:00
parent cdd7812b12
commit fa6f1e54e3
1 changed files with 1 additions and 7 deletions
@@ -342,9 +342,7 @@ void network_free(Network *network) {
        AddressLabel *label;
        Prefix *prefix;
        Address *address;
-        NetDev *netdev;
        Route *route;
-        Iterator i;

        if (!network)
                return;
@@ -377,11 +375,7 @@ void network_free(Network *network) {
        netdev_unref(network->bond);
        netdev_unref(network->vrf);

-        HASHMAP_FOREACH(netdev, network->stacked_netdevs, i) {
-                hashmap_remove(network->stacked_netdevs, netdev->ifname);
-                netdev_unref(netdev);
-        }
-        hashmap_free(network->stacked_netdevs);
+        hashmap_free_with_destructor(network->stacked_netdevs, netdev_unref);

        while ((route = network->static_routes))
                route_free(route);