From: Roy Marples <roy@marples.name>
Date: Wed, 4 May 2016 11:51:44 +0000 (+0000)
Subject: Fix compile.
X-Git-Tag: v6.11.0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e93ffab1620e36c34442e08cf5a9e27e22eb5f72;p=thirdparty%2Fdhcpcd.git

Fix compile.
---

diff --git a/if-bsd.c b/if-bsd.c
index 39a87650..249fa4e3 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -319,7 +319,7 @@ if_findsa(struct dhcpcd_ctx *ctx, const struct sockaddr *sa)
 	{
 		const struct sockaddr_dl *sdl;
 
-		sdl = (void *)sa;
+		sdl = (const void *)sa;
 		return if_findsdl(ctx, sdl);
 	}
 #ifdef INET
@@ -328,7 +328,7 @@ if_findsa(struct dhcpcd_ctx *ctx, const struct sockaddr *sa)
 		const struct sockaddr_in *sin;
 		struct ipv4_addr *ia;
 
-		sin = (void *)sa;
+		sin = (const void *)sa;
 		if ((ia = ipv4_findmaskaddr(ctx, &sin->sin_addr)))
 			return ia->iface;
 		break;
@@ -340,7 +340,7 @@ if_findsa(struct dhcpcd_ctx *ctx, const struct sockaddr *sa)
 		const struct sockaddr_in6 *sin;
 		struct ipv6_addr *ia;
 
-		sin = (void *)sa;
+		sin = (const void *)sa;
 		if ((ia = ipv6_findmaskaddr(ctx, &sin->sin6_addr)))
 			return ia->iface;
 		break;
@@ -563,9 +563,6 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
 {
 	char *cp;
 	struct sockaddr *sa, *rti_info[RTAX_MAX];
-	struct sockaddr_dl *sdl;
-	struct sockaddr_in *sin;
-	struct ipv4_addr *ia;
 
 	cp = (void *)(rtm + 1);
 	sa = (void *)cp;
@@ -610,6 +607,8 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
 	if (rt->iface == NULL &&
 	    !(~rtm->rtm_flags & (RTF_HOST | RTF_GATEWAY)))
 	{
+		struct ipv4_addr *ia;
+
 		if ((ia = ipv4_findaddr(ctx, &rt->dest)))
 			rt->iface = ia->iface;
 	}
@@ -921,9 +920,6 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
 {
 	char *cp;
 	struct sockaddr *sa, *rti_info[RTAX_MAX];
-	struct sockaddr_dl *sdl;
-	struct sockaddr_in6 *sin;
-	struct ipv6_addr *ia;
 
 	cp = (void *)(rtm + 1);
 	sa = (void *)cp;
@@ -1016,6 +1012,8 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
 	if (rt->iface == NULL &&
 	    !(~rtm->rtm_flags & (RTF_HOST | RTF_GATEWAY)))
 	{
+		struct ipv6_addr *ia;
+
 		if ((ia = ipv6_findaddr(ctx, &rt->dest, 0)))
 			rt->iface = ia->iface;
 	}