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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/libip6t_hbh.c | 6 | ||||
| -rw-r--r-- | extensions/libxt_set.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c index 76b4ff00..4cebecfd 100644 --- a/extensions/libip6t_hbh.c +++ b/extensions/libip6t_hbh.c @@ -5,8 +5,6 @@ #include <xtables.h> #include <linux/netfilter_ipv6/ip6t_opts.h> -#define DEBUG 0 - enum { O_HBH_LEN = 0, O_HBH_OPTS, @@ -83,7 +81,7 @@ parse_options(const char *optsstr, uint16_t *opts) opts[i] |= (0x00FF); } -#if DEBUG +#ifdef DEBUG printf("opts str: %s %s\n", cp, range); printf("opts opt: %04X\n", opts[i]); #endif @@ -92,7 +90,7 @@ parse_options(const char *optsstr, uint16_t *opts) free(buffer); -#if DEBUG +#ifdef DEBUG printf("addr nr: %d\n", i); #endif diff --git a/extensions/libxt_set.h b/extensions/libxt_set.h index 5a1bdcf7..41dfbd30 100644 --- a/extensions/libxt_set.h +++ b/extensions/libxt_set.h @@ -8,12 +8,6 @@ #include <errno.h> #include "../iptables/xshared.h" -#ifdef DEBUG -#define DEBUGP(x, args...) fprintf(stderr, x , ## args) -#else -#define DEBUGP(x, args...) -#endif - static int get_version(unsigned *version) { |