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 a0a00cc24caa1605797fd83e7c8353f4ab433e92..111aee9e4861ef0daa4033262a016f5cd8ca5ff0 100644 (file)
--- 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 896f7c1df23199cddd40f756935c49fd6f9039b1..16335fc22b3e45895f567c757db951488235b114 100644 (file)
--- 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] == ' ')