Use correct type for pci_id file accessor functions
authorMathias Krause <mathias.krause@secunet.com>
Fri, 24 Feb 2012 08:39:31 +0000 (09:39 +0100)
committerJeremy Huddleston <jeremyhu@apple.com>
Fri, 24 Feb 2012 22:22:04 +0000 (14:22 -0800)
This fixes the compiler warning of using the wrong type for gzgets() and
gzclose() as they want a gzFile argument, not a pointer to gzFile. The
abstraction layer pci_id_file should just abstract the full type.

Signed-off-by: Mathias Krause <mathias.krause@secunet.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
src/common_device_name.c

index 8feaf69..b2765dd 100644 (file)
@@ -69,7 +69,7 @@ pci_id_file_open(void)
 #define pci_id_file_gets(l, s, f)      gzgets(f, l, s)
 #define pci_id_file_close(f)           gzclose(f)
 #else
-typedef FILE pci_id_file;
+typedef FILE pci_id_file;
 #define pci_id_file_open()             fopen(PCIIDS_PATH "/pci.ids", "r")
 #define pci_id_file_gets(l, s, f)      fgets(l, s, f)
 #define pci_id_file_close(f)           fclose(f)
@@ -189,7 +189,7 @@ insert( uint16_t vendor )
 static void
 populate_vendor( struct pci_id_leaf * vend, int fill_device_data )
 {
-    pci_id_file f;
+    pci_id_file f;
     char buf[128];
     unsigned vendor = PCI_MATCH_ANY;