X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.h;h=baba9df62b6556bf136bce340190df7e3f3d2a6d;hp=590895a575278aa897e17f9fd1f4605d71723213;hb=83ff4b94b044086d80b1e189e5601274bd5b4852;hpb=5b051a66fad3c208380d69b4b13d09929fcfe101

diff --git a/utils.h b/utils.h
index 590895a..baba9df 100644
--- a/utils.h
+++ b/utils.h
@@ -50,20 +50,8 @@ void info(const char *format, ...);
 	     p = list_empty(h) ? list_first_entry(h, typeof(*p), list)         \
                            : list_entry(p->list.next, typeof(*p), list))
 
-static inline void
-fw3_free_list(struct list_head *list)
-{
-	struct list_head *cur, *tmp;
-
-	list_for_each_safe(cur, tmp, list)
-	{
-		list_del(cur);
-		free(cur);
-	}
-}
-
 #define fw3_is_family(p, f)                                                \
-	(!p || p->family == FW3_FAMILY_ANY || p->family == f)
+	(!p || (p)->family == FW3_FAMILY_ANY || (p)->family == f)
 
 const char * fw3_find_command(const char *cmd);
 
@@ -87,16 +75,11 @@ enum fw3_statefile_type
 	FW3_TYPE_IPSET    = 2,
 };
 
-struct fw3_statefile_entry
-{
-	struct list_head list;
-	enum fw3_statefile_type type;
-	char *name;
-	uint32_t flags[2];
-};
-
-struct list_head * fw3_read_statefile(void);
+bool fw3_read_statefile(void *state);
 void fw3_write_statefile(void *state);
-void fw3_free_statefile(struct list_head *statefile);
+
+void fw3_set_running(void *object, struct list_head *dest);
+
+void fw3_free_object(void *obj, const void *opts);
 
 #endif