[Pcsclite-cvs-commit] r4446 - /trunk/Drivers/ccid/src/ccid_usb.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Oct  8 08:22:24 2009
New Revision: 4446

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4446
Log:
Use usb_strerror() instead of strerror(errno) to also get the libusb
specifc error messages

Modified:
    trunk/Drivers/ccid/src/ccid_usb.c

Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=4446&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Thu Oct  8 08:22:24 2009
@@ -434,7 +434,7 @@
 					if (dev_handle == NULL)
 					{
 						DEBUG_CRITICAL4("Can't usb_open(%s/%s): %s",
-							bus->dirname, dev->filename, strerror(errno));
+							bus->dirname, dev->filename, usb_strerror());
 
 						continue;
 					}
@@ -485,7 +485,7 @@
 					{
 						(void)usb_close(dev_handle);
 						DEBUG_CRITICAL4("Can't claim interface %s/%s: %s",
-							bus->dirname, dev->filename, strerror(errno));
+							bus->dirname, dev->filename, usb_strerror());
 						interface_number = -1;
 						continue;
 					}
@@ -587,7 +587,7 @@
 	{
 		DEBUG_CRITICAL4("usb_bulk_write(%s/%s): %s",
 			usbDevice[reader_index].dirname, usbDevice[reader_index].filename,
-			strerror(errno));
+			usb_strerror());
 
 		if (ENODEV == errno)
 			return STATUS_NO_SUCH_DEVICE;
@@ -625,7 +625,7 @@
 		*length = 0;
 		DEBUG_CRITICAL4("usb_bulk_read(%s/%s): %s",
 			usbDevice[reader_index].dirname, usbDevice[reader_index].filename,
-			strerror(errno));
+			usb_strerror());
 
 		if (ENODEV == errno)
 			return STATUS_NO_SUCH_DEVICE;
@@ -884,7 +884,7 @@
 	if (n <= 0)
 	{
 		DEBUG_INFO2("IFD does not support GET_DATA_RATES request: %s",
-			strerror(errno));
+			usb_strerror());
 		return NULL;
 	}
 
@@ -976,7 +976,7 @@
 		if ((errno != EILSEQ) && (errno != EAGAIN) && (errno != ENODEV) && (errno != 0))
 			DEBUG_COMM4("usb_interrupt_read(%s/%s): %s",
 					usbDevice[reader_index].dirname,
-					usbDevice[reader_index].filename, strerror(errno));
+					usbDevice[reader_index].filename, usb_strerror());
 	}
 	else
 		DEBUG_XXD("NotifySlotChange: ", buffer, ret);