diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-01 04:35:23 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-01 04:35:23 +0000 |
| commit | 26c07de910a78f47bef7ff42768edbd06d1d2a77 (patch) | |
| tree | d966e344a9627a22973246d5c73f21de07f83025 /usr.sbin/config | |
| parent | 14a238cd2fb6586628725e50ef1d3ef4ad01c771 (diff) | |
Kill the nearly-15-years-dead cf_ivstubs field from struct cfdata.
ok miod@, deraadt@
N.B.: If you're following -current, you MUST recompile config(8) and
re-config your kernel or else ioconf.c will fail to compile.
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 2534d0826ef..e5fa316d18b 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkioconf.c,v 1.28 2008/03/24 21:35:03 maja Exp $ */ +/* $OpenBSD: mkioconf.c,v 1.29 2011/06/01 04:35:21 matthew Exp $ */ /* $NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $ */ /* @@ -349,7 +349,7 @@ emitcfdata(FILE *fp) #define DSTR FSTATE_DSTAR\n\ \n\ struct cfdata cfdata[] = {\n\ - /* attachment driver unit state loc flags parents nm ivstubs starunit1 */\n") < 0) + /* attachment driver unit state loc flags parents nm starunit1 */\n") < 0) return (1); for (p = packed; (i = *p) != NULL; p++) { /* the description */ @@ -388,8 +388,6 @@ struct cfdata cfdata[] = {\n\ state = "NORM"; } } - vs = ""; - v = 0; if (i->i_locoff >= 0) { (void)snprintf(locbuf, sizeof locbuf, "loc+%3d", i->i_locoff); @@ -397,11 +395,11 @@ struct cfdata cfdata[] = {\n\ } else loc = "loc"; if (fprintf(fp, "\ - {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#4x, pv+%2d, %d, %s%d, %4d},\n", + {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#4x, pv+%2d, %d, %4d},\n", attachment, strlen(attachment) < 6 ? "\t\t" : "\t", basename, strlen(basename) < 3 ? "\t\t" : "\t", unit, state, loc, i->i_cfflags, i->i_pvoff, i->i_locnami, - vs, v, unit) < 0) + unit) < 0) return (1); } if (fprintf(fp, " {0},\n {0},\n {0},\n {0},\n") < 0) |