summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2006-10-22 21:06:19 +0000
committerchristos <christos@NetBSD.org>2006-10-22 21:06:19 +0000
commitf80d108fb1d99db8982f8bfdb787f56e253e07bb (patch)
tree8544d7e22b28c5d15c1036df50c3aa3f3182e381
parent6846f1da94156536caa2a01e7bff0bc09f4e3479 (diff)
fix initializers
-rw-r--r--usr.sbin/installboot/fstypes.c12
-rw-r--r--usr.sbin/installboot/installboot.c14
2 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/installboot/fstypes.c b/usr.sbin/installboot/fstypes.c
index a8d899c76a0..bdc4b26ff89 100644
--- a/usr.sbin/installboot/fstypes.c
+++ b/usr.sbin/installboot/fstypes.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fstypes.c,v 1.9 2006/06/20 05:37:24 jdc Exp $ */
+/* $NetBSD: fstypes.c,v 1.10 2006/10/22 21:06:19 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: fstypes.c,v 1.9 2006/06/20 05:37:24 jdc Exp $");
+__RCSID("$NetBSD: fstypes.c,v 1.10 2006/10/22 21:06:19 christos Exp $");
#endif /* !__lint */
#include <sys/types.h>
@@ -55,11 +55,11 @@ __RCSID("$NetBSD: fstypes.c,v 1.9 2006/06/20 05:37:24 jdc Exp $");
struct ib_fs fstypes[] = {
#ifndef NO_STAGE2
- { "ffs", ffs_match, ffs_findstage2 },
- { "raid", raid_match, ffs_findstage2 },
- { "raw", raw_match, raw_findstage2 },
+ { .name = "ffs", .match = ffs_match, .findstage2 = ffs_findstage2 },
+ { .name = "raid", .match = raid_match, .findstage2 = ffs_findstage2 },
+ { .name = "raw", .match = raw_match, .findstage2 = raw_findstage2 },
#endif
- { 0, 0, 0 }
+ { .name = NULL, }
};
#ifndef NO_STAGE2
diff --git a/usr.sbin/installboot/installboot.c b/usr.sbin/installboot/installboot.c
index d142a5ef39e..e9fe72078c7 100644
--- a/usr.sbin/installboot/installboot.c
+++ b/usr.sbin/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.26 2006/04/22 19:57:04 christos Exp $ */
+/* $NetBSD: installboot.c,v 1.27 2006/10/22 21:06:19 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.26 2006/04/22 19:57:04 christos Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.27 2006/10/22 21:06:19 christos Exp $");
#endif /* !__lint */
#include <sys/ioctl.h>
@@ -83,18 +83,18 @@ const struct option {
} type;
int offset; /* of field in ib_params */
} options[] = {
- { "alphasum", IB_ALPHASUM, OPT_BOOL },
- { "append", IB_APPEND, OPT_BOOL },
+ { "alphasum", IB_ALPHASUM, OPT_BOOL, 0 },
+ { "append", IB_APPEND, OPT_BOOL, 0 },
{ "command", IB_COMMAND, OPT_STRING, OFFSET(command) },
{ "console", IB_CONSOLE, OPT_WORD, OFFSET(console) },
{ "ioaddr", IB_CONSADDR, OPT_INT, OFFSET(consaddr) },
{ "keymap", IB_KEYMAP, OPT_WORD, OFFSET(keymap) },
{ "password", IB_PASSWORD, OPT_WORD, OFFSET(password) },
- { "resetvideo", IB_RESETVIDEO, OPT_BOOL },
+ { "resetvideo", IB_RESETVIDEO, OPT_BOOL, 0 },
{ "speed", IB_CONSPEED, OPT_INT, OFFSET(conspeed) },
- { "sunsum", IB_SUNSUM, OPT_BOOL },
+ { "sunsum", IB_SUNSUM, OPT_BOOL, 0 },
{ "timeout", IB_TIMEOUT, OPT_INT, OFFSET(timeout) },
- { NULL },
+ { .name = NULL },
};
#undef OFFSET
#define OPTION(params, type, opt) (*(type *)((char *)(params) + (opt)->offset))