diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-02-11 00:33:30 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-06 17:43:13 +0200 |
| commit | dbb77543ad6afe29e9a1881b2d4fc212de621a55 (patch) | |
| tree | 52cdf11fded05c39431fc612891253044d0ee9f2 /ip6tables.c | |
| parent | 7a236f4cc685a420c1a782a5db614a93baf37ccf (diff) | |
Fix -Wshadow warnings and clean up xt_sctp.h
Note: xt_sctp.h is still not merged upstream in the kernel as of
this commit. But a refactoring was really needed.
Diffstat (limited to 'ip6tables.c')
| -rw-r--r-- | ip6tables.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ip6tables.c b/ip6tables.c index c5423778..4b517e57 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -440,16 +440,16 @@ add_command(unsigned int *cmd, const int newcmd, const int othercmds, } int -check_inverse(const char option[], int *invert, int *optind, int argc) +check_inverse(const char option[], int *invert, int *my_optind, int argc) { if (option && strcmp(option, "!") == 0) { if (*invert) exit_error(PARAMETER_PROBLEM, "Multiple `!' flags not allowed"); *invert = TRUE; - if (optind) { - *optind = *optind+1; - if (argc && *optind > argc) + if (my_optind != NULL) { + ++*my_optind; + if (argc && *my_optind > argc) exit_error(PARAMETER_PROBLEM, "no argument following `!'"); } @@ -1492,7 +1492,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle) break; case 'M': - modprobe = optarg; + modprobe_program = optarg; break; case 'c': @@ -1673,7 +1673,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle) *handle = ip6tc_init(*table); /* try to insmod the module if iptc_init failed */ - if (!*handle && load_xtables_ko(modprobe, 0) != -1) + if (!*handle && load_xtables_ko(modprobe_program, 0) != -1) *handle = ip6tc_init(*table); if (!*handle) |