iface: remove redundant parentheses

This commit is contained in:
Jan Engelhardt
2009-04-26 21:56:25 +02:00
parent 1aae519356
commit e1fc5f2086
2 changed files with 5 additions and 6 deletions

View File

@@ -62,7 +62,7 @@ static bool iface_valid_name(const char *name)
{
char invalid_chars[] = ".+!*";
return !((strlen(name) >= IFNAMSIZ) || (strcspn(name, invalid_chars) != strlen(name)));
return !(strlen(name) >= IFNAMSIZ || strcspn(name, invalid_chars) != strlen(name));
}
static void iface_mt_help(void)
@@ -158,7 +158,7 @@ static void iface_mt_check(unsigned int flags)
if (!(flags & XT_IFACE_IFACE))
xtables_error(PARAMETER_PROBLEM,
"iface: You must specify an interface");
if ((flags == 0) || (flags == XT_IFACE_IFACE))
if (flags == 0 || flags == XT_IFACE_IFACE)
xtables_error(PARAMETER_PROBLEM,
"iface: You must specify at least one option");
}

View File

@@ -43,15 +43,14 @@ static bool xt_iface_mt(const struct sk_buff *skb,
int i;
retval =
((dev = dev_get_by_name(&init_net, info->ifname)) != NULL);
(dev = dev_get_by_name(&init_net, info->ifname)) != NULL;
if (retval) {
for (i=0; (i<XT_IFACE_FLAGCOUNT) && (retval); i++)
{
for (i = 0; i < XT_IFACE_FLAGCOUNT && retval; ++i) {
if (info->flags & xt_iface_lookup[i].iface_flag)
retval = retval && (dev->flags & xt_iface_lookup[i].iff_flag);
if (info->invflags & xt_iface_lookup[i].iface_flag)
retval = retval && !(dev->flags & xt_iface_lookup[i].iff_flag);
}
}
dev_put(dev);
}
return retval;