Change ipv6_freeaddr into a macro for a minor size improvement.

diff --git a/ipv6.c b/ipv6.c
index 261097ba531fd3e5444d770ee52da83e12b3011d..607fd46ecdef968b746cc17178efaca18e070fb0 100644 (file)
--- 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 ab40a1199ca124d5db7bc820b19cca4434c540a3..dceaf30c1b709a6fa388b9a5b3e31084cf060b72 100644 (file)
--- 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)