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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Jun 17 09:51:59 2010
New Revision: 5010

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5010
Log:
WriteUSB(), ReadUSB() & InterruptRead(): display strerror(errno) instead
of just the code returned by the libusb_*_transfer() function

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=5010&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Thu Jun 17 09:51:59 2010
@@ -591,9 +591,9 @@
 
 	if (rv < 0)
 	{
-		DEBUG_CRITICAL4("libusb_bulk_write(%d/%d): %d",
+		DEBUG_CRITICAL4("libusb_bulk_write(%d/%d): %s",
 			usbDevice[reader_index].bus_number,
-			usbDevice[reader_index].device_address, rv);
+			usbDevice[reader_index].device_address, strerror(errno));
 
 		if (ENODEV == errno)
 			return STATUS_NO_SUCH_DEVICE;
@@ -630,9 +630,9 @@
 	if (rv < 0)
 	{
 		*length = 0;
-		DEBUG_CRITICAL4("libusb_bulk_read(%d/%d): %d",
+		DEBUG_CRITICAL4("libusb_bulk_read(%d/%d): %s",
 			usbDevice[reader_index].bus_number,
-			usbDevice[reader_index].device_address, rv);
+			usbDevice[reader_index].device_address, strerror(errno));
 
 		if (ENODEV == errno)
 			return STATUS_NO_SUCH_DEVICE;
@@ -985,9 +985,9 @@
 	{
 		/* if libusb_interrupt_transfer() times out we get EILSEQ or EAGAIN */
 		if ((errno != EILSEQ) && (errno != EAGAIN) && (errno != ENODEV) && (errno != 0))
-			DEBUG_COMM4("libusb_interrupt_transfer(%d/%d): %d",
+			DEBUG_COMM4("libusb_interrupt_transfer(%d/%d): %s",
 				usbDevice[reader_index].bus_number,
-				usbDevice[reader_index].device_address, ret);
+				usbDevice[reader_index].device_address, strerror(errno));
 	}
 	else
 		DEBUG_XXD("NotifySlotChange: ", (const unsigned char *)buffer, actual_length);