From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 26 May 2013 15:13:49 +0000 (+0200)
Subject: Replace fw3_free_zone() with the generic implementation
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35d57952d708007f5a08a72421fe55e775e3fd0f;p=oweals%2Ffirewall3.git

Replace fw3_free_zone() with the generic implementation
---

diff --git a/zones.c b/zones.c
index dbf682f..4de6625 100644
--- a/zones.c
+++ b/zones.c
@@ -687,23 +687,3 @@ fw3_resolve_zone_addresses(struct fw3_zone *zone)
 
 	return all;
 }
-
-void
-fw3_free_zone(struct fw3_zone *zone)
-{
-	struct fw3_device *dev, *tmp;
-
-	list_for_each_entry_safe(dev, tmp, &zone->devices, list)
-	{
-		list_del(&dev->list);
-		free(dev);
-	}
-
-	list_for_each_entry_safe(dev, tmp, &zone->networks, list)
-	{
-		list_del(&dev->list);
-		free(dev);
-	}
-
-	fw3_free_object(zone, fw3_zone_opts);
-}
diff --git a/zones.h b/zones.h
index b438870..cf5ce3c 100644
--- a/zones.h
+++ b/zones.h
@@ -46,7 +46,8 @@ struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name);
 
 struct list_head * fw3_resolve_zone_addresses(struct fw3_zone *zone);
 
-void fw3_free_zone(struct fw3_zone *zone);
+#define fw3_free_zone(zone) \
+	fw3_free_object(zone, fw3_zone_opts)
 
 #define fw3_to_src_target(t) \
 	(FW3_FLAG_SRC_ACCEPT - FW3_FLAG_ACCEPT + t)