utils.h: Avoid name clashes for setbit/delbit/hasbit

[project/firewall3.git] / defaults.c

diff --git a/defaults.c b/defaults.c
index 4936b38..8afbf9a 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -154,7 +154,7 @@ fw3_print_default_chains(struct fw3_ipt_handle *handle, struct fw3_state *state,
                        continue;
 
                if (c->flag &&
-                   !hasbit(defs->flags[handle->family == FW3_FAMILY_V6], c->flag))
+                   !fw3_hasbit(defs->flags[handle->family == FW3_FAMILY_V6], c->flag))
                        continue;
 
                fw3_ipt_create_chain(handle, c->format);
@@ -163,13 +163,6 @@ fw3_print_default_chains(struct fw3_ipt_handle *handle, struct fw3_state *state,
        set(defs->flags, handle->family, handle->table);
 }
 
-
-struct toplevel_rule {
-       enum fw3_table table;
-       const char *chain;
-       const char *target;
-};
-
 void
 fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
                              struct fw3_state *state, bool reload)