-test11

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-83

diff --git a/ChangeLog b/ChangeLog
index 34f643a07bd805f684c3ebabd8a533d691a59430..430ac5689e1c3135868c686a5dd5900517c263b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2005-09-11  Martin Mares  <mj@ucw.cz>
+
+       * Released as 2.1.99-test11.
+
+       * lspci.c: Removed unnecessary trailing zeros in pci_lookup_name() calls.
+
 2005-09-10  Martin Mares  <mj@ucw.cz>
 
+       * Released as 2.1.99-test10.
+
        * pci.ids: Synchronized with the current database snapshot.
 
        * update-pciids.sh: Changed the default URL for downloading pci.ids

diff --git a/Makefile b/Makefile
index a1c710af2c9215e30494d19035a63136dcf590db..384d530ce05eca11d7657321f6adcc63b73af956 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.1.99-test10
-DATE=2005-09-10
+VERSION=2.1.99-test11
+DATE=2005-09-11
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin

diff --git a/lspci.c b/lspci.c
index 7295bdd8a3d5eaa1fa9b3fca33002ee382ec2299..65d4ec8d2778b1b9edbf1bcd8b550016dafaafc9 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -255,10 +255,10 @@ show_terse(struct device *d)
   printf(" %s: %s",
         pci_lookup_name(pacc, classbuf, sizeof(classbuf),
                         PCI_LOOKUP_CLASS,
-                        get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
+                        get_conf_word(d, PCI_CLASS_DEVICE)),
         pci_lookup_name(pacc, devbuf, sizeof(devbuf),
                         PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                        p->vendor_id, p->device_id, 0, 0));
+                        p->vendor_id, p->device_id));
   if (c = get_conf_byte(d, PCI_REVISION_ID))
     printf(" (rev %02x)", c);
   if (verbose)
@@ -267,7 +267,7 @@ show_terse(struct device *d)
       c = get_conf_byte(d, PCI_CLASS_PROG);
       x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),
                          PCI_LOOKUP_PROGIF | PCI_LOOKUP_NO_NUMBERS,
-                         get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);
+                         get_conf_word(d, PCI_CLASS_DEVICE), c);
       if (c || x)
        {
          printf(" (prog-if %02x", c);
@@ -1782,11 +1782,11 @@ show_machine(struct device *d)
       show_slot_name(d);
       putchar('\n');
       printf("Class:\t%s\n",
-            pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0));
+            pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, get_conf_word(d, PCI_CLASS_DEVICE)));
       printf("Vendor:\t%s\n",
-            pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, 0, 0));
+            pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id));
       printf("Device:\t%s\n",
-            pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, 0, 0));
+            pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id));
       if (sv_id && sv_id != 0xffff)
        {
          printf("SVendor:\t%s\n",
@@ -1804,11 +1804,11 @@ show_machine(struct device *d)
       show_slot_name(d);
       printf(" \"%s\" \"%s\" \"%s\"",
             pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS,
-                            get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
+                            get_conf_word(d, PCI_CLASS_DEVICE)),
             pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR,
-                            p->vendor_id, p->device_id, 0, 0),
+                            p->vendor_id, p->device_id),
             pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE,
-                            p->vendor_id, p->device_id, 0, 0));
+                            p->vendor_id, p->device_id));
       if (c = get_conf_byte(d, PCI_REVISION_ID))
        printf(" -r%02x", c);
       if (c = get_conf_byte(d, PCI_CLASS_PROG))
@@ -2029,7 +2029,7 @@ show_tree_dev(struct device *d, byte *line, byte *p)
     p += sprintf(p, "  %s",
                 pci_lookup_name(pacc, namebuf, sizeof(namebuf),
                                 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                                q->vendor_id, q->device_id, 0, 0));
+                                q->vendor_id, q->device_id));
   print_it(line, p);
 }