iptables: Remove explicit static variables initalization.
PATCH 1/2 iptables: Remove explicit static variables initalization.
In reply to a message not in the archiveStatic variables are initialized to zero by default, so remove explicit initalization. This patch fixes the checkpatch issue.
Signed-off-by Varsha Rao <[email protected]>
--- iptables/ip6tables-restore.c | 2 +- iptables/ip6tables-save.c | 2 +- iptables/iptables-restore.c | 2 +- iptables/iptables-save.c | 2 +- iptables/iptables-xml.c | 10 +++++----- iptables/xtables-arp.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
iptables/ip6tables-restore.c +1 -1
@@ -26,7 +26,7 @@ #define DEBUGP(x, args...)#endif -static int counters =0 , verbose =0 , noflush =0 , wait =0 ; +static int counters, verbose, noflush, wait;static struct timeval wait_interval = { .tv_sec =1 ,
iptables/ip6tables-save.c +1 -1
@@ -18,7 +18,7 @@#include "ip6tables.h" #include "ip6tables-multi.h" -static int show_counters =0 ; +static int show_counters;static const struct option options[] = { {.name ="counters" , .has_arg = false, .val ='c' },
iptables/iptables-restore.c +1 -1
@@ -23,7 +23,7 @@ #define DEBUGP(x, args...)#endif -static int counters =0 , verbose =0 , noflush =0 , wait =0 ; +static int counters, verbose, noflush, wait;static struct timeval wait_interval = { .tv_sec =1 ,
iptables/iptables-save.c +1 -1
@@ -17,7 +17,7 @@#include "iptables.h" #include "iptables-multi.h" -static int show_counters =0 ; +static int show_counters;static const struct option options[] = { {.name ="counters" , .has_arg = false, .val ='c' },
iptables/iptables-xml.c +5 -5
@@ -34,9 +34,9 @@ struct xtables_globals iptables_xml_globals = {static void print_usage (const char *name,const char *version) __attribute__ ((noreturn)); -static int verbose =0 ; +static int verbose;/* Whether to combine actions of sequential rules with identical conditions */ -static int combine =0 ; +static int combine;/* Keeping track of external matches and targets. */ static struct option options[] = { {"verbose" ,0 ,NULL ,'v' },
@@ -73,10 +73,10 @@ parse_counters(char *string, struct xt_counters *ctr)/* global new argv and argc */ static char *newargv[255 ]; -static unsigned int newargc =0 ; +static unsigned int newargc;static char *oldargv[255 ]; -static unsigned int oldargc =0 ; +static unsigned int oldargc;/* arg meta data, were they quoted, frinstance */ static int newargvattr[255 ];
@@ -96,7 +96,7 @@ struct chain {#define maxChains 10240/* max chains per table */ static struct chain chains[maxChains]; -static int nextChain =0 ; +static int nextChain;/* funCtion adding one argument to newargv, updating newargc * returns true if argument added, false otherwise */
iptables/xtables-arp.c +1 -1
@@ -150,7 +150,7 @@ static struct option original_opts[] = {int RUNTIME_NF_ARP_NUMHOOKS =3 ;static struct option *opts = original_opts; -static unsigned int global_option_offset =0 ; +static unsigned int global_option_offset;extern void xtables_exit_error (enum xtables_exittype status,const char *msg, ...) __attribute__((noreturn,format (printf,2 ,3 )));struct xtables_globals arptables_globals = {
Signature · 1 line
2.9.3
PATCH 2/2 iptables: Remove unnecessary braces.
In reply to a message not in the archiveRemove braces which are not required, to fix the check patch issue. The following coccinelle script was used to fix this issue.
@@
expression e;
expression e1;
@@
if(e)
-{
e1;
-}
Signed-off-by Varsha Rao <[email protected]>
--- iptables/iptables-standalone.c | 3 +-- iptables/iptables.c | 3 +-- iptables/xtables-standalone.c | 3 +-- iptables/xtables-translate.c | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-)
iptables/iptables-standalone.c +1 -2
@@ -73,9 +73,8 @@ iptables_main(int argc, char *argv[])fprintf (stderr,"iptables: %s.\n" ,iptc_strerror (errno)); } -if (errno ==EAGAIN ) { +if (errno ==EAGAIN )exit (RESOURCE_PROBLEM ); - } }exit (!ret);
iptables/iptables.c +1 -2
@@ -1114,9 +1114,8 @@ void print_rule4(const struct ipt_entry *e, e->ip.invflags & IPT_INV_FRAG ? " !" : "");/* Print matchinfo part */ -if (e->target_offset) { +if (e->target_offset)IPT_MATCH_ITERATE (e, print_match_save, &e->ip); - }/* print counters for iptables -R */ if (counters <0 )
iptables/xtables-standalone.c +1 -2
@@ -85,9 +85,8 @@ xtables_main(int family, const char *progname, int argc, char *argv[])fprintf (stderr,"iptables: %s.\n" ,nft_strerror (errno)); } -if (errno ==EAGAIN ) { +if (errno ==EAGAIN )exit (RESOURCE_PROBLEM ); - } }exit (!ret);
iptables/xtables-translate.c +2 -4
@@ -236,9 +236,8 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[],switch (p.command) {case CMD_APPEND : ret =1 ; -if (!xlate (h, &p, &cs, &args, true, nft_rule_xlate_add)) { +if (!xlate (h, &p, &cs, &args, true, nft_rule_xlate_add))print_ipt_cmd (argc, argv); - }break ;case CMD_DELETE :break ;
@@ -250,9 +249,8 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[],break ;case CMD_INSERT : ret =1 ; -if (!xlate (h, &p, &cs, &args, false, nft_rule_xlate_add)) { +if (!xlate (h, &p, &cs, &args, false, nft_rule_xlate_add))print_ipt_cmd (argc, argv); - }break ;case CMD_FLUSH :if (p.chain) {
Signature · 1 line
2.9.3
Quoted 2 lines · Varsha Rao
Static variables are initialized to zero by default, so remove explicit initalization. This patch fixes the checkpatch issue.
Applied.
But I had to add this chunk:
iptables/xtables-restore.c +1 -1
@@ -24,7 +24,7 @@ #define DEBUGP(x, args...)#endif -static int counters =0 , verbose =0 , noflush =0 ; +static int counters, verbose, noflush;/* Keeping track of external matches and targets. */ static const struct option options[] = {
You have to be more careful. It's good if you just fix all spots in one single go.
Thanks!
Re: [PATCH 2/2] iptables: Remove unnecessary braces.
In reply to Varsha RaoReview
Quoted 11 lines · Varsha Rao
Remove braces which are not required, to fix the check patch issue. The following coccinelle script was used to fix this issue.
@@
expression e;
expression e1;
@@
if(e)(quoted diff) +0
-2-{ e1; -}
Applied, thanks.