Less printf() calls for libip6t_esp.c
PATCH 1/1 Less printf() calls for libip6t_esp.c
Harald,
this attached patch contains C99 initializers and printf()
simplifications fo libip6t_esp.c.
Please apply.
Stephane
userspace/extensions/libip6t_esp.c +19 -27
@@ -19,8 +19,8 @@ }static struct option opts[] = { - {"espspi" ,1 ,0 ,'1' }, - {0 } + { .name ="espspi" , .has_arg =1 , .flag =0 , .val ='1' }, + { .name =0 } }; static u_int32_t
@@ -29,7 +29,7 @@unsigned long int spi;char * ep; - spi =strtoul (spistr,&ep,0 ) ; + spi =strtoul (spistr, &ep,0 );if ( spistr == ep ) { exit_error(PARAMETER_PROBLEM,
@@ -117,17 +117,10 @@const char *inv = invert ?"!" :"" ;if (min !=0 || max !=0xFFFFFFFF || invert) { -printf ("%s" , name); -if (min == max) { -printf (":%s" , inv); -printf ("%u" , min); - }else { -printf ("s:%s" , inv); -printf ("%u" ,min); -printf (":" ); -printf ("%u" ,max); - } -printf (" " ); +if (min == max) +printf ("%s:%s%u " , name, inv, min); +else +printf ("%ss:%s%u:%u " , name, inv, min, max); } }
@@ -168,19 +161,18 @@ }static -struct ip6tables_match esp -= {NULL , -"esp" , -IPTABLES_VERSION , -IP6T_ALIGN (sizeof (struct ip6t_esp )), -IP6T_ALIGN (sizeof (struct ip6t_esp )), - &help, - &init, - &parse, - &final_check, - &print, - &save, - opts +struct ip6tables_match esp = { + .name ="esp" , + .version =IPTABLES_VERSION , + .size =IP6T_ALIGN (sizeof (struct ip6t_esp )), + .userspacesize =IP6T_ALIGN (sizeof (struct ip6t_esp )), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts };void
Quoted 4 lines · Stephane Ouellette
Harald,
this attached patch contains C99 initializers and
printf()
simplifications folibip6t_esp.c.
Thanks!
Sorry for the late reply, but first was the netfilter developer summit in Budapest, and then our project's server was down - so I didn't really have the time to take care of your patches. Please don't misunderstand this as lack of interest in your contributions.
They are now all applied.
Quoted 2 lines
Please apply.
Stephane
Signature · 5 lines
- Harald Welte <[email protected]> http://www.netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie