From 86de6715b464b02bd339ed9faa4ba2da27d7cd4a Mon Sep 17 00:00:00 2001
From: "Joseph C. Lehner" <joseph.c.lehner@gmail.com>
Date: Tue, 25 May 2021 18:02:33 +0200
Subject: [PATCH] Use clearer variable names

---
 ethsock.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ethsock.c b/ethsock.c
index 4950cb3..2155890 100644
--- a/ethsock.c
+++ b/ethsock.c
@@ -200,36 +200,34 @@ static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask,
 {
 	struct rtnl_addr *ra = NULL;
 	struct nl_sock *sk = NULL;
-	struct nl_addr *na = NULL;
+	struct nl_addr *laddr = NULL;
+	struct nl_addr *bcast = NULL;
 	int err = 1;
 
 	if (!(sk = xnl_socket_route())) {
 		return false;
 	}
 
+	if (!(laddr = build_ip(ipaddr))) {
+		goto out;
+	}
+
+	nl_addr_set_prefixlen(laddr, bitcount(ipmask));
+
+	if (!(bcast = build_ip((ipaddr & ipmask) | ~ipmask))) {
+		goto out;
+	}
+
 	if (!(ra = rtnl_addr_alloc())) {
 		xperror("rtnl_addr_alloc");
 		goto out;
 	}
 
 	rtnl_addr_set_ifindex(ra, if_nametoindex(intf));
+	rtnl_addr_set_local(ra, laddr);
+	rtnl_addr_set_broadcast(ra, bcast);
 
-	if (!(na = build_ip(ipaddr))) {
-		goto out;
-	}
-
-	nl_addr_set_prefixlen(na, bitcount(ipmask));
-	rtnl_addr_set_local(ra, na);
-	nl_addr_put(na);
-
-	if (!(na = build_ip((ipaddr & ipmask) | ~ipmask))) {
-		goto out;
-	}
-
-	rtnl_addr_set_broadcast(ra, na);
-	nl_addr_put(na);
-
-	if ((err = add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0) {
+	if ((err = ((add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0))) {
 		if (add && err == -NLE_EXIST) {
 			err = 0;
 		} else if (add || verbosity > 1) {
@@ -239,6 +237,8 @@ static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask,
 
 out:
 	rtnl_addr_put(ra);
+	nl_addr_put(laddr);
+	nl_addr_put(bcast);
 	nl_socket_free(sk);
 
 	return !err;