From owner-p4-projects@FreeBSD.ORG  Wed Jun 18 05:42:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C06CB1065679; Wed, 18 Jun 2008 05:42:48 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83DDA1065674
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 05:42:48 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EAAA8FC1A
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 05:42:48 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5I5gmWR085241
	for <perforce@FreeBSD.org>; Wed, 18 Jun 2008 05:42:48 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5I5gj0i085237
	for perforce@freebsd.org; Wed, 18 Jun 2008 05:42:45 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Wed, 18 Jun 2008 05:42:45 GMT
Message-Id: <200806180542.m5I5gj0i085237@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143681 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jun 2008 05:42:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=143681

Change 143681 by weongyo@weongyo_ws on 2008/06/18 05:41:56

	handle (PCI|PCMCIA|USB) .INF files correctly that specify multiple
	entries in [Manufacturer] sections.

Affected files ...

.. //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#3 edit

Differences ...

==== //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#3 (text+ko) ====

@@ -285,7 +285,7 @@
 	struct section *sec;
 	struct assign *assign;
 	char xpsec[256];
-	int found = 0;
+	int first = 1, found = 0;
 
 	/* Find manufacturer name */
 	manf = find_assign("Manufacturer", NULL);
@@ -322,8 +322,11 @@
 
 	found = 0;
 
-	/* Emit start of PCI device table */
-	fprintf (ofp, "#define NDIS_PCI_DEV_TABLE");
+	if (first == 1) {
+		/* Emit start of PCI device table */
+		fprintf (ofp, "#define NDIS_PCI_DEV_TABLE");
+		first = 0;
+	}
 
 retry:
 
@@ -375,7 +378,7 @@
 	struct section *sec;
 	struct assign *assign;
 	char xpsec[256];
-	int found = 0;
+	int first = 1, found = 0;
 
 	/* Find manufacturer name */
 	manf = find_assign("Manufacturer", NULL);
@@ -412,8 +415,11 @@
 
 	found = 0;
 
-	/* Emit start of PCMCIA device table */
-	fprintf (ofp, "#define NDIS_PCMCIA_DEV_TABLE");
+	if (first == 1) {
+		/* Emit start of PCMCIA device table */
+		fprintf (ofp, "#define NDIS_PCMCIA_DEV_TABLE");
+		first = 0;
+	}
 
 retry:
 
@@ -465,7 +471,7 @@
 	struct section *sec;
 	struct assign *assign;
 	char xpsec[256];
-	int found = 0;
+	int first = 1, found = 0;
 
 	/* Find manufacturer name */
 	manf = find_assign("Manufacturer", NULL);
@@ -502,8 +508,11 @@
 
 	found = 0;
 
-	/* Emit start of USB device table */
-	fprintf (ofp, "#define NDIS_USB_DEV_TABLE");
+	if (first == 1) {
+		/* Emit start of USB device table */
+		fprintf (ofp, "#define NDIS_USB_DEV_TABLE");
+		first = 0;
+	}
 
 retry: