From 2c69b55e55f2efc5a334b87ccdceaa9de0ecb658 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Apr 2009 19:32:02 +0200 Subject: iptables: replace open-coded sizeof by ARRAY_SIZE Signed-off-by: Jan Engelhardt --- extensions/libipt_LOG.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'extensions/libipt_LOG.c') diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index ebcb5742..5b90033a 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -72,9 +72,7 @@ parse_level(const char *level) if (!xtables_strtoui(level, NULL, &lev, 0, 7)) { unsigned int i = 0; - for (i = 0; - i < sizeof(ipt_log_names) / sizeof(struct ipt_log_names); - i++) { + for (i = 0; i < ARRAY_SIZE(ipt_log_names); ++i) if (strncasecmp(level, ipt_log_names[i].name, strlen(level)) == 0) { if (set++) @@ -83,7 +81,6 @@ parse_level(const char *level) level); lev = ipt_log_names[i].level; } - } if (!set) xtables_error(PARAMETER_PROBLEM, @@ -201,15 +198,12 @@ static void LOG_print(const void *ip, const struct xt_entry_target *target, printf("flags %u level %u ", loginfo->logflags, loginfo->level); else { - for (i = 0; - i < sizeof(ipt_log_names) / sizeof(struct ipt_log_names); - i++) { + for (i = 0; i < ARRAY_SIZE(ipt_log_names); ++i) if (loginfo->level == ipt_log_names[i].level) { printf("level %s ", ipt_log_names[i].name); break; } - } - if (i == sizeof(ipt_log_names) / sizeof(struct ipt_log_names)) + if (i == ARRAY_SIZE(ipt_log_names)) printf("UNKNOWN level %u ", loginfo->level); if (loginfo->logflags & IPT_LOG_TCPSEQ) printf("tcp-sequence "); -- cgit v1.2.3