diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-08-02 17:05:15 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-08-04 14:24:54 +0200 |
| commit | 78b9d438037f2c83a7bbb73eb1b86cc295967905 (patch) | |
| tree | da1268751fdf521e545fefdbd126717c84f6ce52 /iptables | |
| parent | 14ad525cf2ad35928c12e7ec6710fb556f6d1ef7 (diff) | |
Consolidate DEBUGP macros
This debug printing macro was defined in various places, always
identical. Move it into xshared.h and drop it from sources including
that header. There are a few exceptions:
* iptables-xml.c did not include xshared.h, which this patch changes.
* Sources in extensions and libiptc mostly left alone since they don't
include xshared.h (and maybe shouldn't). Only libxt_set.h does, so
it's converted, too.
This also converts DEBUG define use in libip6t_hbh.c to avoid a compiler
warning.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables')
| -rw-r--r-- | iptables/ip6tables-restore.c | 6 | ||||
| -rw-r--r-- | iptables/iptables-restore.c | 6 | ||||
| -rw-r--r-- | iptables/iptables-xml.c | 7 | ||||
| -rw-r--r-- | iptables/nft-shared.h | 5 | ||||
| -rw-r--r-- | iptables/xshared.h | 6 | ||||
| -rw-r--r-- | iptables/xtables-restore.c | 6 |
6 files changed, 8 insertions, 28 deletions
diff --git a/iptables/ip6tables-restore.c b/iptables/ip6tables-restore.c index d36f92da..3065768e 100644 --- a/iptables/ip6tables-restore.c +++ b/iptables/ip6tables-restore.c @@ -20,12 +20,6 @@ #include "libiptc/libip6tc.h" #include "ip6tables-multi.h" -#ifdef DEBUG -#define DEBUGP(x, args...) fprintf(stderr, x, ## args) -#else -#define DEBUGP(x, args...) -#endif - static int counters, verbose, noflush, wait; static struct timeval wait_interval = { diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c index 142ddb82..e52e8e47 100644 --- a/iptables/iptables-restore.c +++ b/iptables/iptables-restore.c @@ -17,12 +17,6 @@ #include "libiptc/libiptc.h" #include "iptables-multi.h" -#ifdef DEBUG -#define DEBUGP(x, args...) fprintf(stderr, x, ## args) -#else -#define DEBUGP(x, args...) -#endif - static int counters, verbose, noflush, wait; static struct timeval wait_interval = { diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index 69c19a60..a1b09f3a 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -16,12 +16,7 @@ #include "libiptc/libiptc.h" #include "xtables-multi.h" #include <xtables.h> - -#ifdef DEBUG -#define DEBUGP(x, args...) fprintf(stderr, x, ## args) -#else -#define DEBUGP(x, args...) -#endif +#include "xshared.h" struct xtables_globals iptables_xml_globals = { .option_offset = 0, diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 882f60e8..5ef17a08 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -11,12 +11,9 @@ #include "xshared.h" -#if 0 -#define DEBUGP(x, args...) fprintf(stdout, x, ## args) +#ifdef DEBUG #define NLDEBUG #define DEBUG_DEL -#else -#define DEBUGP(x, args...) #endif /* diff --git a/iptables/xshared.h b/iptables/xshared.h index 533c5268..363549db 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -10,6 +10,12 @@ #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/netfilter_ipv6/ip6_tables.h> +#ifdef DEBUG +#define DEBUGP(x, args...) fprintf(stdout, x, ## args) +#else +#define DEBUGP(x, args...) +#endif + enum { OPT_NONE = 0, OPT_NUMERIC = 1 << 0, diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index 5c0ae98e..0a3d1a31 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -19,12 +19,6 @@ #include "nft-bridge.h" #include <libnftnl/chain.h> -#ifdef DEBUG -#define DEBUGP(x, args...) fprintf(stderr, x, ## args) -#else -#define DEBUGP(x, args...) -#endif - static int counters, verbose, noflush; /* Keeping track of external matches and targets. */ |