From: Roy Marples <roy@marples.name>
Date: Fri, 27 Feb 2015 20:55:38 +0000 (+0000)
Subject: Change ipv6_freeaddr into a macro for a minor size improvement.
X-Git-Tag: v6.8.0~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad3f7fa9eaf07a05895f600b3ff01874471a8357;p=thirdparty%2Fdhcpcd.git

Change ipv6_freeaddr into a macro for a minor size improvement.
---

diff --git a/ipv6.c b/ipv6.c
index 261097ba..607fd46e 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -823,14 +823,6 @@ ipv6_addaddrs(struct ipv6_addrhead *addrs)
 	return i;
 }
 
-void
-ipv6_freeaddr(struct ipv6_addr *ap)
-{
-
-	eloop_q_timeout_delete(ap->iface->ctx->eloop, 0, NULL, ap);
-	free(ap);
-}
-
 void
 ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
     const struct interface *ifd)
diff --git a/ipv6.h b/ipv6.h
index ab40a119..dceaf30c 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -252,7 +252,11 @@ struct ipv6_addr *ipv6_findaddr(struct dhcpcd_ctx *,
     const struct in6_addr *, short);
 #define ipv6_linklocal(ifp) ipv6_iffindaddr((ifp), NULL)
 int ipv6_addlinklocalcallback(struct interface *, void (*)(void *), void *);
-void ipv6_freeaddr(struct ipv6_addr *);
+//void ipv6_freeaddr(struct ipv6_addr *);
+#define ipv6_freeaddr(ap) do { \
+	eloop_q_timeout_delete((ap)->iface->ctx->eloop, 0, NULL, (ap)); \
+	free(ap); \
+	} while (0)
 void ipv6_freedrop(struct interface *, int);
 #define ipv6_free(ifp) ipv6_freedrop((ifp), 0)
 #define ipv6_drop(ifp) ipv6_freedrop((ifp), 2)