[Pcsclite-cvs-commit] r2426 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2007-02-23 17:45:05 +0100 (Fri, 23 Feb 2007)
New Revision: 2426

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
get_end_points(): change parameter name from usb_device to usbdevice to
avoid: warning: declaration of 'usb_device' shadows a global declaration
/usr/include/usb.h:329: warning: shadowed declaration is here


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2007-02-23 16:41:18 UTC (rev 2425)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2007-02-23 16:45:05 UTC (rev 2426)
@@ -82,7 +82,7 @@
 /* The _usbDevice structure must be defined before including ccid_usb.h */
 #include "ccid_usb.h"
 
-static int get_end_points(struct usb_device *dev, _usbDevice *usb_device);
+static int get_end_points(struct usb_device *dev, _usbDevice *usbdevice);
 int ccid_check_firmware(struct usb_device *dev);
 static unsigned int *get_data_rates(unsigned int reader_index,
 	struct usb_device *dev);
@@ -596,7 +596,7 @@
  *					get_end_points
  *
  ****************************************************************************/
-static int get_end_points(struct usb_device *dev, _usbDevice *usb_device)
+static int get_end_points(struct usb_device *dev, _usbDevice *usbdevice)
 {
 	int i;
 	int bEndpointAddress;
@@ -613,10 +613,10 @@
 		bEndpointAddress = usb_interface->altsetting->endpoint[i].bEndpointAddress;
 
 		if ((bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_ENDPOINT_IN)
-			usb_device->bulk_in = bEndpointAddress;
+			usbdevice->bulk_in = bEndpointAddress;
 
 		if ((bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_ENDPOINT_OUT)
-			usb_device->bulk_out = bEndpointAddress;
+			usbdevice->bulk_out = bEndpointAddress;
 	}
 
 	return 0;