From 6dd4b3398ff9dbaee9165eef2732d92a93df94ba Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 16 Oct 2006 03:04:45 +0000
Subject: [PATCH] c99 initializers.

---
 sbin/newfs/mkfs.c  | 6 +++---
 sbin/newfs/newfs.c | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 43c99cca3724..e3a69d8f37f0 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkfs.c,v 1.101 2006/08/26 22:03:47 christos Exp $	*/
+/*	$NetBSD: mkfs.c,v 1.102 2006/10/16 03:04:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mkfs.c,v 1.101 2006/08/26 22:03:47 christos Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.102 2006/10/16 03:04:45 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1454,7 +1454,7 @@ zap_old_sblock(int sblkoff)
 		{0, 0x70162, ~0u},		/* LFS_MAGIC */
 		{14, 0xef53, 0xffff},		/* EXT2FS (little) */
 		{14, 0xef530000, 0xffff0000},	/* EXT2FS (big) */
-		{~0u},
+		{.offset = ~0u},
 	};
 	const struct fsm *fsm;
 
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 1e508ac1f715..ac2ab4c414f0 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: newfs.c,v 1.94 2006/08/27 18:49:08 christos Exp $	*/
+/*	$NetBSD: newfs.c,v 1.95 2006/10/16 03:04:45 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1993, 1994
@@ -78,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: newfs.c,v 1.94 2006/08/27 18:49:08 christos Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.95 2006/10/16 03:04:45 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -115,8 +115,8 @@ __RCSID("$NetBSD: newfs.c,v 1.94 2006/08/27 18:49:08 christos Exp $");
 #include <syslog.h>
 #include <unistd.h>
 #include <util.h>
+#include <mntopts.h>
 
-#include "mntopts.h"
 #include "dkcksum.h"
 #include "extern.h"
 #include "partutil.h"
@@ -127,7 +127,7 @@ struct mntopt mopts[] = {
 	MOPT_UPDATE,
 	MOPT_GETARGS,
 	MOPT_NOATIME,
-	{ NULL },
+	{ .m_option = NULL },
 };
 
 static gid_t mfs_group(const char *);