Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that condmkopttab isn't a hash table anymore, don't initialise it with

Browse Source 
ht_new()...  So actually rename it to condmkoptions to avoid confusion.

Reported build failure on amd64 (strange that I wouldn't get it on i386) on
current-users by Kurt Schreiner.
This commit is contained in:
cube 2009-03-13 20:44:59 +00:00
parent c27d58c8b1
commit 1894a7d27b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/config/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.29 2009/03/13 18:24:41 cube Exp $ */
/* $NetBSD: defs.h,v 1.30 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@ -402,7 +402,7 @@ struct nvlist *options; /* options */
struct nvlist *fsoptions; /* filesystems */
struct nvlist *mkoptions; /* makeoptions */
struct nvlist *appmkoptions; /* appending mkoptions */
struct nvlist *condmkopttab; /* conditional makeoption table */
struct nvlist *condmkoptions; /* conditional makeoption table */
struct hashtab *devbasetab; /* devbase lookup */
struct hashtab *devroottab; /* attach at root lookup */
struct hashtab *devatab; /* devbase attachment lookup */

5
usr.bin/config/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.35 2009/03/13 18:24:41 cube Exp $ */
/* $NetBSD: main.c,v 1.36 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@ -264,7 +264,6 @@ main(int argc, char **argv)
needcnttab = ht_new();
opttab = ht_new();
mkopttab = ht_new();
condmkopttab = ht_new();
fsopttab = ht_new();
deffstab = ht_new();
defopttab = ht_new();
@ -280,7 +279,7 @@ main(int argc, char **argv)
nextopt = &options;
nextmkopt = &mkoptions;
nextappmkopt = &appmkoptions;
nextcndmkopt = &condmkopttab;
nextcndmkopt = &condmkoptions;
nextfsopt = &fsoptions;
/*

4
usr.bin/config/mkmakefile.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkmakefile.c,v 1.11 2009/03/13 18:24:41 cube Exp $ */
/* $NetBSD: mkmakefile.c,v 1.12 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@ -555,7 +555,7 @@ emitappmkoptions(FILE *fp)
for (nv = appmkoptions; nv != NULL; nv = nv->nv_next)
fprintf(fp, "%s+=%s\n", nv->nv_name, nv->nv_str);
for (nv = condmkopttab; nv != NULL; nv = nv->nv_next)
for (nv = condmkoptions; nv != NULL; nv = nv->nv_next)
{
if (expr_eval(nv->nv_ptr, selectopt, NULL))
fprintf(fp, "%s+=%s\n", nv->nv_name, nv->nv_str);