From adb20edec60a28e79ad68bdb744b5be5aaf1a695 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 6 Apr 2008 15:43:13 +0000 Subject: [PATCH 05/24] 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. --- extensions/libxt_state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'extensions/libxt_state.c') diff --git a/extensions/libxt_state.c b/extensions/libxt_state.c index 68f5280..5b8beea 100644 --- a/extensions/libxt_state.c +++ b/extensions/libxt_state.c @@ -29,17 +29,17 @@ static const struct option state_opts[] = { }; static int -state_parse_state(const char *state, size_t strlen, struct xt_state_info *sinfo) +state_parse_state(const char *state, size_t len, struct xt_state_info *sinfo) { - if (strncasecmp(state, "INVALID", strlen) == 0) + if (strncasecmp(state, "INVALID", len) == 0) sinfo->statemask |= XT_STATE_INVALID; - else if (strncasecmp(state, "NEW", strlen) == 0) + else if (strncasecmp(state, "NEW", len) == 0) sinfo->statemask |= XT_STATE_BIT(IP_CT_NEW); - else if (strncasecmp(state, "ESTABLISHED", strlen) == 0) + else if (strncasecmp(state, "ESTABLISHED", len) == 0) sinfo->statemask |= XT_STATE_BIT(IP_CT_ESTABLISHED); - else if (strncasecmp(state, "RELATED", strlen) == 0) + else if (strncasecmp(state, "RELATED", len) == 0) sinfo->statemask |= XT_STATE_BIT(IP_CT_RELATED); - else if (strncasecmp(state, "UNTRACKED", strlen) == 0) + else if (strncasecmp(state, "UNTRACKED", len) == 0) sinfo->statemask |= XT_STATE_UNTRACKED; else return 0; -- cgit v1.2.3