[PATCH libpciaccess] Use correct type for pci_id file accessor functions

Mathias Krause mathias.krause at secunet.com
Tue Jan 31 02:46:34 PST 2012

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 at secunet.com>
 src/common_device_name.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common_device_name.c b/src/common_device_name.c
index 8e8a752..bc87708 100644
--- a/src/common_device_name.c
+++ b/src/common_device_name.c
@@ -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)
-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;

More information about the xorg-devel mailing list