From: Martin Mares <mj@ucw.cz>
Date: Sat, 30 Mar 2002 15:13:06 +0000 (+0000)
Subject: End-of-line comments are no longer supported. Hashes are now perfectly valid in
X-Git-Tag: v3.0.0~196
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=d2f666f18f2d5c465f26de94106f7b5855a45c5b;p=pciutils.git

End-of-line comments are no longer supported. Hashes are now perfectly valid in
all names and they start a comment only at the start of the line.
---

diff --git a/ChangeLog b/ChangeLog
index a0a00cc..111aee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-30  Martin Mares  <mj@ucw.cz>
+
+	* lib/names.c (parse_name_list): End-of-line comments are no longer
+	supported. Hashes are now perfectly valid in all names and they start
+	a comment only at the start of the line.
+
+	* pci.ids: Synchronized with the PCI ID database.
+
 2002-03-26  Martin Mares  <mj@ucw.cz>
 
 	* README: Rewritten.
diff --git a/lib/names.c b/lib/names.c
index 896f7c1..16335fc 100644
--- a/lib/names.c
+++ b/lib/names.c
@@ -1,5 +1,5 @@
 /*
- *	$Id: names.c,v 1.7 2002/03/24 12:14:40 mj Exp $
+ *	$Id: names.c,v 1.8 2002/03/30 15:13:06 mj Exp $
  *
  *	The PCI Library -- ID to Name Translation
  *
@@ -98,19 +98,10 @@ parse_name_list(struct pci_access *a)
       lino++;
       q = p;
       while (*p && *p != '\n')
-	{
-	  if (*p == '#')
-	    {
-	      *p++ = 0;
-	      while (*p && *p != '\n')
-		p++;
-	      break;
-	    }
-	  p++;
-	}
+	p++;
       if (*p == '\n')
 	*p++ = 0;
-      if (!*q)
+      if (!*q || *q == '#')
 	continue;
       r = p;
       while (r > q && r[-1] == ' ')