diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-11 22:56:30 -0400 |
| commit | fa89550518af96a8804749c0ab0916599a94c1da (patch) | |
| tree | 57db50190ad4bcdbc9ef54efc528db4286daedac /src/libfirewall/firewall-util.c | |
| parent | f4b50a2aa19f5a99008565f4127952ea8f2e4f61 (diff) | |
Run the new fixup script.
The biggest change is that it keeps looking for new #include
blocks. This means that it (more) correctly handles #ifdef'd
#includes.
I'm not 100% in love with it, but it's pretty good for automated.
What I really don't like is it did some silly things with newlines
in typedef blocks. I've avoided committing those. I think it may
be possible to get it to do the right thing. But really, the
typedef blocks are a hack for poorly structured headers.
Now that it keeps looking for new #include blocks, I could strip
out the typedef support, and it would mostly work; but it wouldn't
be able to move some headers back to the top.
IDK what to do.
Diffstat (limited to 'src/libfirewall/firewall-util.c')
| -rw-r--r-- | src/libfirewall/firewall-util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libfirewall/firewall-util.c b/src/libfirewall/firewall-util.c index 212bbe00ee..009cef3e88 100644 --- a/src/libfirewall/firewall-util.c +++ b/src/libfirewall/firewall-util.c @@ -32,18 +32,20 @@ #ifndef IFNAMSIZ #define IFNAMSIZ 16 #endif +#include <libiptc/libiptc.h> + #include <linux/if.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter/nf_nat.h> #include <linux/netfilter/xt_addrtype.h> -#include <libiptc/libiptc.h> #include "basic/alloc-util.h" -#include "firewall-util.h" #include "basic/in-addr-util.h" #include "basic/macro.h" #include "basic/socket-util.h" +#include "firewall-util.h" + DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free); static int entry_fill_basics( |