Reduce the whole mask matching into a single for-loop. No need for a
shortcut, /32 masks will match in the first iteration.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
libxtables/xtables.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index bc42ba8221f3a..fc3f622072adc 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -1430,16 +1430,11 @@ int xtables_ipmask_to_cidr(const struct in_addr *mask)
int i;
maskaddr = ntohl(mask->s_addr);
- /* shortcut for /32 networks */
- if (maskaddr == 0xFFFFFFFFL)
- return 32;
-
- i = 32;
- bits = 0xFFFFFFFEL;
- while (--i >= 0 && maskaddr != bits)
- bits <<= 1;
- if (i >= 0)
- return i;
+
+ for (i = 32, bits = (uint32_t)-1; i >= 0; i--, bits <<= 1) {
+ if (bits == maskaddr)
+ return i;
+ }
/* this mask cannot be converted to CIDR notation */
return -1;
--
2.28.0
