From 56fe510492bc2b95d84f7ab81a994b459076b7d1 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 25 Oct 2019 14:35:51 +0200 Subject: Replace TRUE/FALSE with true/false And drop the conditional defines. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- iptables/ip6tables.c | 14 +++----------- iptables/iptables.c | 12 ++---------- iptables/xtables-arp.c | 17 +++++------------ iptables/xtables.c | 11 ++--------- 4 files changed, 12 insertions(+), 42 deletions(-) (limited to 'iptables') diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index e48fdeb1..576c2cf8 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -45,14 +45,6 @@ #include "ip6tables-multi.h" #include "xshared.h" -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - - #define NUMBER_OF_OPT ARRAY_SIZE(optflags) static const char optflags[] = { 'n', 's', 'd', 'p', 'j', 'v', 'x', 'i', 'o', '0', 'c'}; @@ -1525,7 +1517,7 @@ int do_command6(int argc, char *argv[], char **table, xtables_error(PARAMETER_PROBLEM, "multiple consecutive ! not" " allowed"); - cs.invert = TRUE; + cs.invert = true; optarg[0] = '\0'; continue; } @@ -1537,12 +1529,12 @@ int do_command6(int argc, char *argv[], char **table, /* * If new options were loaded, we must retry * getopt immediately and not allow - * cs.invert=FALSE to be executed. + * cs.invert=false to be executed. */ continue; break; } - cs.invert = FALSE; + cs.invert = false; } if (!wait && wait_interval_set) diff --git a/iptables/iptables.c b/iptables/iptables.c index 255b61b1..88ef6cf6 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -41,14 +41,6 @@ #include #include "xshared.h" -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - - #define OPT_FRAGMENT 0x00800U #define NUMBER_OF_OPT ARRAY_SIZE(optflags) static const char optflags[] @@ -1518,7 +1510,7 @@ int do_command4(int argc, char *argv[], char **table, xtables_error(PARAMETER_PROBLEM, "multiple consecutive ! not" " allowed"); - cs.invert = TRUE; + cs.invert = true; optarg[0] = '\0'; continue; } @@ -1531,7 +1523,7 @@ int do_command4(int argc, char *argv[], char **table, continue; break; } - cs.invert = FALSE; + cs.invert = false; } if (!wait && wait_interval_set) diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index ae69baf2..4949ddd3 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -55,13 +55,6 @@ typedef char arpt_chainlabel[32]; -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #define OPTION_OFFSET 256 #define OPT_NONE 0x00000U @@ -383,7 +376,7 @@ check_inverse(const char option[], int *invert, int *optidx, int argc) if (*invert) xtables_error(PARAMETER_PROBLEM, "Multiple `!' flags not allowed"); - *invert = TRUE; + *invert = true; if (optidx) { *optidx = *optidx+1; if (argc && *optidx > argc) @@ -391,9 +384,9 @@ check_inverse(const char option[], int *invert, int *optidx, int argc) "no argument following `!'"); } - return TRUE; + return true; } - return FALSE; + return false; } static void @@ -942,7 +935,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, xtables_error(PARAMETER_PROBLEM, "multiple consecutive ! not" " allowed"); - invert = TRUE; + invert = true; optarg[0] = '\0'; continue; } @@ -956,7 +949,7 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, } break; } - invert = FALSE; + invert = false; } if (cs.target) diff --git a/iptables/xtables.c b/iptables/xtables.c index 805bd801..8f9dc628 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -43,13 +43,6 @@ #include "nft-shared.h" #include "nft.h" -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #define OPT_FRAGMENT 0x00800U #define NUMBER_OF_OPT ARRAY_SIZE(optflags) static const char optflags[] @@ -952,7 +945,7 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], xtables_error(PARAMETER_PROBLEM, "multiple consecutive ! not" " allowed"); - cs->invert = TRUE; + cs->invert = true; optarg[0] = '\0'; continue; } @@ -965,7 +958,7 @@ void do_parse(struct nft_handle *h, int argc, char *argv[], continue; break; } - cs->invert = FALSE; + cs->invert = false; } if (strcmp(p->table, "nat") == 0 && -- cgit v1.2.3