Attachment 48596 Details for Bug 74360 – ndiscvt.patch

[patch] ndiscvt.patch

ndiscvt.patch (text/plain), 2.11 KB, created by bel on 2004-11-25 08:20:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bel

Created: 2004-11-25 08:20:32 UTC

Size: 2.11 KB

patch

obsolete

>--- usr.sbin/ndiscvt/inf.c.orig	Sun Mar  7 05:49:06 2004
>+++ usr.sbin/ndiscvt/inf.c	Thu Nov 25 09:30:34 2004
>@@ -233,7 +233,7 @@ dump_pci_id(const char *s)
> static void
> dump_deviceids_pci()
> {
>-	struct assign *manf, *dev;
>+	struct assign *manf, *dev, *devid;
> 	struct section *sec;
> 	struct assign *assign;
> 	char xpsec[256];
>@@ -258,8 +258,8 @@ dump_deviceids_pci()
> 
> 	TAILQ_FOREACH(assign, &ah, link) {
> 		if (assign->section == sec) {
>-			dev = find_assign("strings", assign->key);
>-			if (strcasestr(assign->vals[1], "PCI") != NULL) {
>+			devid = find_assign("strings", assign->vals[1]);
>+			if (strcasestr(devid->vals[0], "PCI") != NULL) {
> 				found++;
> 				break;
> 			}
>@@ -285,9 +285,10 @@ retry:
> 	TAILQ_FOREACH(assign, &ah, link) {
> 		if (assign->section == sec) {
> 			dev = find_assign("strings", assign->key);
>+			devid = find_assign("strings", assign->vals[1]);
> 			/* Emit device IDs. */
>-			if (strcasestr(assign->vals[1], "PCI") != NULL)
>-				dump_pci_id(assign->vals[1]);
>+			if (strcasestr(devid->vals[0], "PCI") != NULL)
>+				dump_pci_id(devid->vals[0]);
> 			else
> 				continue;
> 			/* Emit device description */
>@@ -312,7 +313,7 @@ retry:
> static void
> dump_deviceids_pcmcia()
> {
>-	struct assign *manf, *dev;
>+	struct assign *manf, *dev, *devid;
> 	struct section *sec;
> 	struct assign *assign;
> 	char xpsec[256];
>@@ -337,8 +338,8 @@ dump_deviceids_pcmcia()
> 
> 	TAILQ_FOREACH(assign, &ah, link) {
> 		if (assign->section == sec) {
>-			dev = find_assign("strings", assign->key);
>-			if (strcasestr(assign->vals[1], "PCMCIA") != NULL) {
>+			devid = find_assign("strings", assign->vals[1]);
>+			if (strcasestr(devid->vals[0], "PCMCIA") != NULL) {
> 				found++;
> 				break;
> 			}
>@@ -364,9 +365,10 @@ retry:
> 	TAILQ_FOREACH(assign, &ah, link) {
> 		if (assign->section == sec) {
> 			dev = find_assign("strings", assign->key);
>+			devid = find_assign("strings", assign->vals[1]);
> 			/* Emit device IDs. */
>-			if (strcasestr(assign->vals[1], "PCMCIA") != NULL)
>-				dump_pcmcia_id(assign->vals[1]);
>+			if (strcasestr(devid->vals[0], "PCMCIA") != NULL)
>+				dump_pcmcia_id(devid->vals[0]);
> 			else
> 				continue;
> 			/* Emit device description */

Actions: View | Diff

Attachments on bug 74360: 48596