improve interface for cleaning up unused devices

diff --git a/config.c b/config.c
index 1649ceeffe12eb51d9c552e0a8d99239699e0480..2fba53480a49bae335fd9bc38b9d00ac476f7298 100644 (file)
--- a/config.c
+++ b/config.c
@@ -221,7 +221,7 @@ config_init_interfaces(const char *name)
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
-       device_free_all();
+       device_free_unused(NULL);
        config_init = false;
 
        interface_start_pending();

diff --git a/device.c b/device.c
index c02335c1b906c653331d72af5c8220215bcfae97..e206a765669101d19f473fa8cdb927709df0e2a8 100644 (file)
--- a/device.c
+++ b/device.c
@@ -278,15 +278,23 @@ void device_remove_user(struct device_user *dep)
        dep->dev = NULL;
 }
 
+static void
+__device_free_unused(struct device *dev)
+{
+       if (!list_empty(&dev->users))
+               return;
+
+       device_free(dev);
+}
+
 void
-device_free_all(void)
+device_free_unused(struct device *dev)
 {
-       struct device *dev, *tmp;
+       struct device *tmp;
 
-       avl_for_each_element_safe(&devices, dev, avl, tmp) {
-               if (!list_empty(&dev->users))
-                       continue;
+       if (dev)
+               return __device_free_unused(dev);
 
-               device_free(dev);
-       }
+       avl_for_each_element_safe(&devices, dev, avl, tmp)
+               __device_free_unused(dev);
 }

diff --git a/device.h b/device.h
index 63ffb21a100f5ebc9ec295f10e43b66614bd6999..1abd5672b65da872645d41dedeffb19b8592aae1 100644 (file)
--- a/device.h
+++ b/device.h
@@ -158,7 +158,7 @@ device_free(struct device *dev)
        dev->type->free(dev);
 }
 
-void device_free_all(void);
+void device_free_unused(struct device *dev);
 
 struct device *get_vlan_device_chain(const char *ifname, bool create);