upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-24 23:57:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deal with keys with descriptions that have empty fields in some of

Browse source 
their lines.

Properly discard PCMCIA device declarations. I plan to support
PCMCIA cards, but they don't work yet, and it appears some .INF files
declare both PCI and PCMCIA device instances.
This commit is contained in:
Bill Paul 2004-01-23 22:28:22 +00:00
parent 57ab2e0468
commit e7e7d5e91e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
usr.sbin/ndiscvt/inf.c
View file

@ -215,8 +215,9 @@ dump_deviceids()
/* Emit device IDs. */
if (strcasestr(assign->vals[1], "PCI") != NULL)
dump_pci_id(assign->vals[1]);
#ifdef notdef
else if (strcasestr(assign->vals[1], "PCMCIA") != NULL)
continue;
#ifdef notdef
dump_pcmcia_id(assign->vals[1]);
#endif
/* Emit device description */
@ -256,7 +257,8 @@ dump_addreg(const char *s, int devidx)
stringcvt(reg->value), devidx);
} else if (strncasecmp(reg->subkey,
"Ndi\\params", strlen("Ndi\\params")-1) == 0 &&
strcasecmp(reg->key, "ParamDesc") == 0)
(reg->key != NULL && strcasecmp(reg->key,
"ParamDesc") == 0))
dump_paramreg(sec, reg, devidx);
}
}
@ -292,6 +294,8 @@ dump_editreg(const struct section *s, const struct reg *r)
continue;
if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
continue;
if (reg->key == NULL)
continue;
if (strcasecmp(reg->key, "LimitText") == 0)
fprintf(ofp, " [maxchars=%s]", reg->value);
if (strcasecmp(reg->key, "Optional") == 0 &&
@ -312,6 +316,8 @@ dump_dwordreg(const struct section *s, const struct reg *r)
continue;
if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
continue;
if (reg->key == NULL)
continue;
if (strcasecmp(reg->key, "min") == 0)
fprintf(ofp, " [min=%s]", reg->value);
if (strcasecmp(reg->key, "max") == 0)
@ -329,7 +335,7 @@ dump_defaultinfo(const struct section *s, const struct reg *r, int devidx)
continue;
if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
continue;
if (strcasecmp(reg->key, "Default"))
if (reg->key == NULL || strcasecmp(reg->key, "Default"))
continue;
fprintf(ofp, "\n\t{ \"%s\" }, %d },", reg->value == NULL ? "" :
stringcvt(reg->value), devidx);
@ -347,7 +353,7 @@ dump_paramdesc(const struct section *s, const struct reg *r)
continue;
if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
continue;
if (strcasecmp(reg->key, "ParamDesc"))
if (reg->key == NULL || strcasecmp(reg->key, "ParamDesc"))
continue;
fprintf(ofp, "\n\t\"%s", stringcvt(r->value));
break;
@ -364,6 +370,8 @@ dump_typeinfo(const struct section *s, const struct reg *r)
continue;
if (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))
continue;
if (reg->key == NULL)
continue;
if (strcasecmp(reg->key, "type"))
continue;
if (strcasecmp(reg->value, "dword") == 0 ||