diff options
| author | briggs <briggs@cvs.openbsd.org> | 1997-01-18 02:24:22 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1997-01-18 02:24:22 +0000 |
| commit | 3365c90dc4687554bb99299cf49004ba542297e0 (patch) | |
| tree | 4b800c042060d3d58df05513f78ee52a1d93bdfb /usr.sbin/config/mkioconf.c | |
| parent | 2b5c10d28c4ef509dc19fbd6de2b20d9c1410699 (diff) | |
Sync. with current NetBSD--keeping local changes.
Diffstat (limited to 'usr.sbin/config/mkioconf.c')
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 54f5206c8bd..7e1ae8ad673 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: mkioconf.c,v 1.7 1996/10/23 22:37:55 niklas Exp $ */ -/* $NetBSD: mkioconf.c,v 1.40 1996/08/31 21:15:10 mycroft Exp $ */ +/* $OpenBSD: mkioconf.c,v 1.8 1997/01/18 02:24:17 briggs Exp $ */ +/* $NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $ */ /* * Copyright (c) 1992, 1993 @@ -343,7 +343,7 @@ emitcfdata(fp) { register struct devi **p, *i, **par; register int unit, v; - register const char *vs, *state, *basename, *attachment; + register const char *state, *basename, *attachment; register struct nvlist *nv; register struct attr *a; char *loc; @@ -356,7 +356,7 @@ emitcfdata(fp) #define DSTR FSTATE_DSTAR\n\ \n\ struct cfdata cfdata[] = {\n\ - /* attachment driver unit state loc flags parents nm ivstubs */\n") < 0) + /* attachment driver unit state loc flags parents */\n") < 0) return (1); for (p = packed; (i = *p) != NULL; p++) { /* the description */ @@ -396,19 +396,16 @@ struct cfdata cfdata[] = {\n\ state = "NORM"; } } - vs = ""; - v = 0; if (i->i_locoff >= 0) { (void)sprintf(locbuf, "loc+%3d", i->i_locoff); loc = locbuf; } else loc = "loc"; if (fprintf(fp, "\ - {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#4x, pv+%2d, %d, %s%d},\n", + {&%s_ca,%s&%s_cd,%s%2d, %s, %7s, %#6x, pv+%2d},\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) < 0) + state, loc, i->i_cfflags, i->i_pvoff) < 0) return (1); } if (fprintf(fp, " {0},\n {0},\n {0},\n {0},\n") < 0) |