From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 21 Mar 2016 19:13:57 +0000 (-0700)
Subject: netconf: replace macro with a function
X-Git-Tag: v4.6.0~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a4474d90409b9d20758e023711093f903a37d7;p=thirdparty%2Fiproute2.git

netconf: replace macro with a function

The number of casts in macro was excessive.
---

diff --git a/ip/ipnetconf.c b/ip/ipnetconf.c
index 58657a915..158cfa6a4 100644
--- a/ip/ipnetconf.c
+++ b/ip/ipnetconf.c
@@ -24,8 +24,7 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static struct
-{
+static struct {
 	int family;
 	int ifindex;
 } filter;
@@ -38,7 +37,11 @@ static void usage(void)
 	exit(-1);
 }
 
-#define NETCONF_RTA(r)	((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct netconfmsg))))
+static struct rtattr *netconf_rta(struct netconfmsg *ncm)
+{
+	return (struct rtattr *)((char *)ncm
+				 + NLMSG_ALIGN(sizeof(struct netconfmsg)));
+}
 
 int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
 		  struct nlmsghdr *n, void *arg)
@@ -65,7 +68,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
 	if (filter.family && filter.family != ncm->ncm_family)
 		return 0;
 
-	parse_rtattr(tb, NETCONFA_MAX, NETCONF_RTA(ncm),
+	parse_rtattr(tb, NETCONFA_MAX, netconf_rta(ncm),
 		     NLMSG_PAYLOAD(n, sizeof(*ncm)));
 
 	switch (ncm->ncm_family) {