Module Name: src
Committed By: ozaki-r
Date: Mon Aug 1 04:37:53 UTC 2016
Modified Files:
src/sys/netinet6: in6.c in6_ifattach.c
Log Message:
Fix kernel builds (gcc 4.8)
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/netinet6/in6.c
cvs rdiff -u -r1.103 -r1.104 src/sys/netinet6/in6_ifattach.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.213 src/sys/netinet6/in6.c:1.214
--- src/sys/netinet6/in6.c:1.213 Mon Aug 1 03:15:31 2016
+++ src/sys/netinet6/in6.c Mon Aug 1 04:37:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.213 2016/08/01 03:15:31 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.214 2016/08/01 04:37:53 ozaki-r 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.213 2016/08/01 03:15:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.214 2016/08/01 04:37:53 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1486,7 +1486,7 @@ static int
in6_lifaddr_ioctl(struct socket *so, u_long cmd, void *data,
struct ifnet *ifp)
{
- struct in6_ifaddr *ia;
+ struct in6_ifaddr *ia = NULL; /* XXX gcc 4.8 maybe-uninitialized */
struct if_laddrreq *iflr = (struct if_laddrreq *)data;
struct ifaddr *ifa;
struct sockaddr *sa;
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.103 src/sys/netinet6/in6_ifattach.c:1.104
--- src/sys/netinet6/in6_ifattach.c:1.103 Mon Aug 1 03:15:31 2016
+++ src/sys/netinet6/in6_ifattach.c Mon Aug 1 04:37:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.103 2016/08/01 03:15:31 ozaki-r Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.104 2016/08/01 04:37:53 ozaki-r Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.103 2016/08/01 03:15:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.104 2016/08/01 04:37:53 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -321,8 +321,8 @@ in6_get_hw_ifid(struct ifnet *ifp, struc
{
struct ifaddr *ifa;
const struct sockaddr_dl *sdl = NULL;
- const char *addr;
- size_t addrlen;
+ const char *addr = NULL; /* XXX gcc 4.8 -Werror=maybe-uninitialized */
+ size_t addrlen = 0; /* XXX gcc 4.8 -Werror=maybe-uninitialized */
static u_int8_t allzero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
static u_int8_t allone[8] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
