Skip to contentSkip to conversation

netfilter: ipset: ip_set_bitmap_ipmac: use swap macro in bitmap_ipmac_create

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Oct 28, 2017 – Oct 30, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: ipset: ip_set_bitmap_ipmac: use swap macro in bitmap_ipmac_create

Make use of the swap macro and remove unnecessary variable tmp. This makes the code easier to read and maintain.

This code was detected with the help of Coccinelle.

---
 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
net/netfilter/ipset/ip_set_bitmap_ipmac.c +2 -6
index 4c279fb..c00b6a2 100644
@@ -337,12 +337,8 @@ bitmap_ipmac_create(struct net *net, struct ip_set *set, struct nlattr *tb[],
 		ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP_TO], &last_ip);
 		if (ret)
 			return ret;
-		if (first_ip > last_ip) {
-			u32 tmp = first_ip;
-
-			first_ip = last_ip;
-			last_ip = tmp;
-		}
+		if (first_ip > last_ip)
+			swap(first_ip, last_ip);
 	} else if (tb[IPSET_ATTR_CIDR]) {
 		u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
 
Signature · 1 line
2.7.4
#1 lore raw

Hi,

Quoted 6 lines · Gustavo A. R. Silva

Make use of the swap macro and remove unnecessary variable tmp. This makes the code easier to read and maintain.

This code was detected with the help of Coccinelle.

Please resubmit the tree patches as a single one, they do the same thing. Thanks!

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences

          H-1525 Budapest 114, POB. 49, Hungary
#2 lore raw

Hi Jozsef,

Quoting Jozsef Kadlecsik <[email protected]>:

Quoted 7 lines

Hi,

Quoted 3 lines · Gustavo A. R. Silva

Make use of the swap macro and remove unnecessary variable tmp. This makes the code easier to read and maintain.

Quoted 7 lines
Quoted 3 lines

This code was detected with the help of Coccinelle.

Please resubmit the tree patches as a single one, they do the same thing. Thanks!

OK. I'll do that.

Thanks