From 54934bd809ae6f27cb7615851c94a9631b78ca80 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 17 Mar 2013 15:18:15 +0000
Subject: [PATCH] [USBSTOR] * Fix some format specifiers.

svn path=/trunk/; revision=58541
---
 reactos/drivers/usb/usbstor/descriptor.c | 4 ++--
 reactos/drivers/usb/usbstor/error.c      | 4 ++--
 reactos/drivers/usb/usbstor/fdo.c        | 2 +-
 reactos/drivers/usb/usbstor/pdo.c        | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/drivers/usb/usbstor/descriptor.c b/reactos/drivers/usb/usbstor/descriptor.c
index 28b7ead3332..4728c6249ee 100644
--- a/reactos/drivers/usb/usbstor/descriptor.c
+++ b/reactos/drivers/usb/usbstor/descriptor.c
@@ -331,7 +331,7 @@ USBSTOR_ScanConfigurationDescriptor(
 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 @@ USBSTOR_GetPipeHandles(
         //
         // 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;
     }
 
diff --git a/reactos/drivers/usb/usbstor/error.c b/reactos/drivers/usb/usbstor/error.c
index 3ed594932cd..0d80946edf7 100644
--- a/reactos/drivers/usb/usbstor/error.c
+++ b/reactos/drivers/usb/usbstor/error.c
@@ -42,7 +42,7 @@ USBSTOR_GetEndpointStatus(
     //
     // 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 @@ USBSTOR_ResetPipeWithHandle(
     //
     // 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);
 
     //
diff --git a/reactos/drivers/usb/usbstor/fdo.c b/reactos/drivers/usb/usbstor/fdo.c
index a9f408da099..83f9c939089 100644
--- a/reactos/drivers/usb/usbstor/fdo.c
+++ b/reactos/drivers/usb/usbstor/fdo.c
@@ -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);
diff --git a/reactos/drivers/usb/usbstor/pdo.c b/reactos/drivers/usb/usbstor/pdo.c
index f7a2a654789..2c70f435f40 100644
--- a/reactos/drivers/usb/usbstor/pdo.c
+++ b/reactos/drivers/usb/usbstor/pdo.c
@@ -671,14 +671,14 @@ USBSTOR_PdoHandleQueryInstanceId(
         //
         // 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 @@ USBSTOR_SendInquiryIrp(
     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],