This code has been disabled since it was committed 20 years ago. While
there, eliminate two instances of the same dead assignment.
ok?
Index: mkioconf.c
===================================================================
RCS file: /var/cvs/src/usr.sbin/config/mkioconf.c,v
retrieving revision 1.35
diff -u -p -r1.35 mkioconf.c
--- mkioconf.c 16 Oct 2016 17:50:00 -0000 1.35
+++ mkioconf.c 22 Oct 2016 21:17:04 -0000
@@ -233,7 +233,6 @@ emitlocnames(FILE *fp)
int added, start;
int v, j, x;
-#if 1
addlocnami(-1);
for (p = packed; (i = *p) != NULL; p++) {
/*printf("child %s\n", i->i_name);*/
@@ -246,7 +245,6 @@ emitlocnames(FILE *fp)
/* add all the names */
a = i->i_atattr;
- nv = a->a_locs;
added = 0;
for (nv = a->a_locs, v = 0; nv != NULL;
nv = nv->nv_next, v++) {
@@ -268,23 +266,6 @@ emitlocnames(FILE *fp)
for (p = packed; (i = *p) != NULL; p++)
if (i->i_pvlen)
i->i_locnami = i->i_parents[0]->i_plocnami;
-#else
- addlocnami(-1);
- for (p = packed; (i = *p) != NULL; p++) {
-
- i->i_locnami = nlocnami;
-
- /* add all the names */
- a = i->i_atattr;
- nv = a->a_locs;
- for (nv = a->a_locs, v = 0; nv != NULL; nv = nv->nv_next, v++)
- addlocnami(addlocname(nv->nv_name));
-
- /* terminate list of names */
- addlocnami(-1);
-
- }
-#endif
if (fprintf(fp, "\nchar *locnames[] = {\n") < 0)
return (1);
for (j = 0; j < nlocnames; j++)
@@ -359,7 +340,6 @@ struct cfdata cfdata[] = {\n\
if (v == 0 && fputs("root", fp) < 0)
return (1);
a = i->i_atattr;
- nv = a->a_locs;
for (nv = a->a_locs, v = 0; nv != NULL; nv = nv->nv_next, v++)
if (fprintf(fp, " %s %s",
nv->nv_name, i->i_locs[v]) < 0)
