Consolidate and unify argument order for functions

[project/firewall3.git] / zones.h

diff --git a/zones.h b/zones.h
index 8f94ccf..63ed3a5 100644 (file)
--- a/zones.h
+++ b/zones.h
@@ -27,22 +27,23 @@ struct fw3_zone * fw3_alloc_zone(void);
 
 void fw3_load_zones(struct fw3_state *state, struct uci_package *p);
 
-void fw3_print_zone_chains(enum fw3_table table, enum fw3_family family,
-                           bool reload, struct fw3_state *state);
+void fw3_print_zone_chains(struct fw3_state *state, enum fw3_family family,
+                           enum fw3_table table, bool reload);
 
-void fw3_print_zone_rules(enum fw3_table table, enum fw3_family family,
-                          bool reload, struct fw3_state *state);
+void fw3_print_zone_rules(struct fw3_state *state, enum fw3_family family,
+                          enum fw3_table table, bool reload);
 
-void fw3_flush_zones(enum fw3_table table, enum fw3_family family,
-                     bool pass2, bool reload, struct fw3_state *state);
+void fw3_flush_zones(struct fw3_state *state, enum fw3_family family,
+                     enum fw3_table table, bool reload, bool pass2);
+
+void fw3_hotplug_zones(struct fw3_state *state, bool add);
 
 struct fw3_zone * fw3_lookup_zone(struct fw3_state *state, const char *name,
                                   bool running);
 
+void fw3_free_zone(struct fw3_zone *zone);
+
 #define fw3_to_src_target(t) \
        (FW3_FLAG_SRC_ACCEPT - FW3_FLAG_ACCEPT + t)
 
-#define fw3_free_zone(zone) \
-       fw3_free_object(zone, fw3_zone_opts)
-
 #endif