Module Name: src
Committed By: dyoung
Date: Sun Feb 6 19:12:55 UTC 2011
Modified Files:
src/sys/netinet6: in6.c
Log Message:
Delete unnecessary casts to void *. No functional change intended. Same
assembly generated before and after this change.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.156 src/sys/netinet6/in6.c:1.157
--- src/sys/netinet6/in6.c:1.156 Thu Apr 22 20:05:15 2010
+++ src/sys/netinet6/in6.c Sun Feb 6 19:12:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.156 2010/04/22 20:05:15 dyoung Exp $ */
+/* $NetBSD: in6.c,v 1.157 2011/02/06 19:12:55 dyoung Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.156 2010/04/22 20:05:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.157 2011/02/06 19:12:55 dyoung Exp $");
#include "opt_inet.h"
#include "opt_pfil_hooks.h"
@@ -965,7 +965,7 @@
M_NOWAIT);
if (ia == NULL)
return ENOBUFS;
- memset((void *)ia, 0, sizeof(*ia));
+ memset(ia, 0, sizeof(*ia));
LIST_INIT(&ia->ia6_memberships);
/* Initialize the address and masks, and put time stamp */
ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
@@ -1607,7 +1607,7 @@
ifra.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME;
ifra.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME;
ifra.ifra_flags = iflr->flags & ~IFLR_PREFIX;
- return in6_control(so, SIOCAIFADDR_IN6, (void *)&ifra, ifp, l);
+ return in6_control(so, SIOCAIFADDR_IN6, &ifra, ifp, l);
}
case SIOCGLIFADDR:
case SIOCDLIFADDR:
@@ -1718,8 +1718,7 @@
ia->ia_prefixmask.sin6_len);
ifra.ifra_flags = ia->ia6_flags;
- return in6_control(so, SIOCDIFADDR_IN6, (void *)&ifra,
- ifp, l);
+ return in6_control(so, SIOCDIFADDR_IN6, &ifra, ifp, l);
}
}
}
