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

Jeremy Huddleston jeremyhu at apple.com
Fri Feb 24 14:24:09 PST 2012


Reviewed and pushed.  Thanks.
   167ffb1..2a58cd1  master -> master

FWIW, the warnings were benign since it was still passing the right values along the way, but it's good to be typed correctly =)

--Jeremy

On Feb 24, 2012, at 00:39, Mathias Krause wrote:

> 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>
> ---
> Resend with a wider target audience to hopefully end up in the inbox of
> somebody who cares and has commit rights.
> 
> 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)
> #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;
> 
> -- 
> 1.5.6.5
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 



More information about the xorg-devel mailing list