[ros-diffs] [akhaldi] 58541: [USBSTOR] * Fix some format specifiers.

Author: akhaldi
Date: Sun Mar 17 15:18:15 2013
New Revision: 58541

URL: http://svn.reactos.org/svn/reactos?rev=58541&view=rev
Log:
[USBSTOR]
* Fix some format specifiers.

Modified:
    trunk/reactos/drivers/usb/usbstor/descriptor.c
    trunk/reactos/drivers/usb/usbstor/error.c
    trunk/reactos/drivers/usb/usbstor/fdo.c
    trunk/reactos/drivers/usb/usbstor/pdo.c

Modified: trunk/reactos/drivers/usb/usbstor/descriptor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/descri…
==============================================================================
--- trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbstor/descriptor.c [iso-8859-1] Sun Mar 17 15:18:15 2013
@@ -331,7 +331,7 @@
 VOID
 DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor)
 {
-    DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor);
+    DPRINT1("Dumping ConfigurationDescriptor %p\n", ConfigurationDescriptor);
     DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength);
     DPRINT1("bDescriptorType %x\n",
ConfigurationDescriptor->bDescriptorType);
     DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength);
@@ -535,7 +535,7 @@
         //
         // WTF? usb port driver does not give us bulk pipe access
         //
-        DPRINT1("USBSTOR_GetPipeHandles> BulkInFound %d BulkOutFound %d
missing!!!\n", BulkInFound, BulkOutFound);
+        DPRINT1("USBSTOR_GetPipeHandles> BulkInFound %c BulkOutFound %c
missing!!!\n", BulkInFound, BulkOutFound);
         return STATUS_DEVICE_CONFIGURATION_ERROR;
     }
 

Modified: trunk/reactos/drivers/usb/usbstor/error.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.…
==============================================================================
--- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Sun Mar 17 15:18:15 2013
@@ -42,7 +42,7 @@
     //
     // send the request
     //
-    DPRINT1("Sending Request DeviceObject %x, Urb %x\n", DeviceObject, Urb);
+    DPRINT1("Sending Request DeviceObject %p, Urb %p\n", DeviceObject, Urb);
     Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb);
 
     //
@@ -90,7 +90,7 @@
     //
     // send the request
     //
-    DPRINT1("Sending Request DeviceObject %x, Urb %x\n", DeviceObject, Urb);
+    DPRINT1("Sending Request DeviceObject %p, Urb %p\n", DeviceObject, Urb);
     Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb);
 
     //

Modified: trunk/reactos/drivers/usb/usbstor/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?…
==============================================================================
--- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Sun Mar 17 15:18:15 2013
@@ -14,7 +14,7 @@
 VOID
 USBSTOR_DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)
 {
-    DPRINT1("Dumping Device Descriptor %x\n", DeviceDescriptor);
+    DPRINT1("Dumping Device Descriptor %p\n", DeviceDescriptor);
     DPRINT1("bLength %x\n", DeviceDescriptor->bLength);
     DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType);
     DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB);

Modified: trunk/reactos/drivers/usb/usbstor/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?…
==============================================================================
--- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Mar 17 15:18:15 2013
@@ -671,14 +671,14 @@
         //
         // using serial number from device
         //
-        swprintf(Buffer, L"%s&%d",
FDODeviceExtension->SerialNumber->bString, PDODeviceExtension->LUN);
+        swprintf(Buffer, L"%s&%c",
FDODeviceExtension->SerialNumber->bString, PDODeviceExtension->LUN);
     }
     else
     {
         //
         // use instance count and LUN
         //
-        swprintf(Buffer, L"%04d&%d", FDODeviceExtension->InstanceCount,
PDODeviceExtension->LUN);
+        swprintf(Buffer, L"%04lu&%c", FDODeviceExtension->InstanceCount,
PDODeviceExtension->LUN);
     }
 
     //
@@ -1203,7 +1203,7 @@
     DPRINT1("Version %x\n", Response->Version);
     DPRINT1("Format %x\n", Response->Format);
     DPRINT1("Length %x\n", Response->Length);
-    DPRINT1("Reserved %x\n", Response->Reserved);
+    DPRINT1("Reserved %p\n", Response->Reserved);
     DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0],
Response->Vendor[1], Response->Vendor[2], Response->Vendor[3],
Response->Vendor[4], Response->Vendor[5], Response->Vendor[6],
Response->Vendor[7]);
     DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n",
Response->Product[0], Response->Product[1], Response->Product[2],
Response->Product[3],
                                                           Response->Product[4],
Response->Product[5], Response->Product[6], Response->Product[7],