[ros-diffs] [akhaldi] 58539: [LIBUSB] * Fix some format specifiers.

Author: akhaldi
Date: Sun Mar 17 15:11:05 2013
New Revision: 58539

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

Modified:
    trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
    trunk/reactos/lib/drivers/libusb/hub_controller.cpp
    trunk/reactos/lib/drivers/libusb/usb_device.cpp

Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sun Mar 17 15:11:05
2013
@@ -635,7 +635,7 @@
         //
         // construct device name
         //
-        swprintf(CharDeviceName, L"\\Device\\USBFDO-%d", UsbDeviceNumber);
+        swprintf(CharDeviceName, L"\\Device\\USBFDO-%lu", UsbDeviceNumber);
 
         //
         // initialize device name
@@ -706,8 +706,8 @@
         //
         // create legacy link
         //
-        swprintf(LinkName, L"\\DosDevices\\HCD%d", m_FDODeviceNumber);
-        swprintf(FDOName, L"\\Device\\USBFDO-%d", m_FDODeviceNumber);
+        swprintf(LinkName, L"\\DosDevices\\HCD%lu", m_FDODeviceNumber);
+        swprintf(FDOName, L"\\Device\\USBFDO-%lu", m_FDODeviceNumber);
         RtlInitUnicodeString(&Link, LinkName);
         RtlInitUnicodeString(&FDO, FDOName);
 
@@ -729,7 +729,7 @@
         //
         // create legacy link
         //
-        swprintf(LinkName, L"\\DosDevices\\HCD%d", m_FDODeviceNumber);
+        swprintf(LinkName, L"\\DosDevices\\HCD%lu", m_FDODeviceNumber);
         RtlInitUnicodeString(&Link, LinkName);
 
         //

Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun Mar 17 15:11:05
2013
@@ -321,7 +321,7 @@
     {
         m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange);
 
-        DPRINT1("[%S] Port %d: Status %x, Change %x\n", m_USBType, PortId,
PortStatus, PortChange);
+        DPRINT1("[%S] Port %lu: Status %x, Change %x\n", m_USBType, PortId,
PortStatus, PortChange);
 
 
         //
@@ -329,7 +329,7 @@
         //
         if (PortChange != 0)
         {
-            DPRINT1("[%S] Change state on port %d\n", m_USBType, PortId);
+            DPRINT1("[%S] Change state on port %lu\n", m_USBType, PortId);
             // Set the value for the port number
              *TransferBuffer = 1 << ((PortId + 1) & 7);
             Changed = TRUE;
@@ -1798,8 +1798,8 @@
     DPRINT1("URB_FUNCTION_CLASS_ENDPOINT\n");
     DPRINT1("TransferFlags %x\n",
Urb->UrbControlVendorClassRequest.TransferFlags);
     DPRINT1("TransferBufferLength %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferLength);
-    DPRINT1("TransferBuffer %x\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
-    DPRINT1("TransferBufferMDL %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
+    DPRINT1("TransferBuffer %p\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
+    DPRINT1("TransferBufferMDL %p\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
     DPRINT1("RequestTypeReservedBits %x\n",
Urb->UrbControlVendorClassRequest.RequestTypeReservedBits);
     DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request);
     DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value);
@@ -2141,8 +2141,8 @@
     DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n");
     DPRINT1("TransferFlags %x\n",
Urb->UrbControlVendorClassRequest.TransferFlags);
     DPRINT1("TransferBufferLength %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferLength);
-    DPRINT1("TransferBuffer %x\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
-    DPRINT1("TransferBufferMDL %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
+    DPRINT1("TransferBuffer %p\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
+    DPRINT1("TransferBufferMDL %p\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
     DPRINT1("RequestTypeReservedBits %x\n",
Urb->UrbControlVendorClassRequest.RequestTypeReservedBits);
     DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request);
     DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value);
@@ -3853,7 +3853,7 @@
         //
         // construct device name
         //
-        swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber);
+        swprintf(CharDeviceName, L"\\Device\\USBPDO-%lu", UsbDeviceNumber);
 
         //
         // initialize device name

Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sun Mar 17 15:11:05 2013
@@ -844,7 +844,7 @@
 VOID
 CUSBDevice::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);
@@ -865,7 +865,7 @@
 VOID
 CUSBDevice::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);
@@ -1247,10 +1247,10 @@
         // copy pipe handle
         DPRINT1("PipeIndex %lu\n", PipeIndex);
         DPRINT1("EndpointAddress %x\n",
InterfaceInfo->Pipes[PipeIndex].EndpointAddress);
-        DPRINT1("Interval %d\n", InterfaceInfo->Pipes[PipeIndex].Interval);
-        DPRINT1("MaximumPacketSize %d\n",
InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize);
-        DPRINT1("MaximumTransferSize %d\n",
InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize);
-        DPRINT1("PipeFlags %d\n",
InterfaceInfo->Pipes[PipeIndex].PipeFlags);
+        DPRINT1("Interval %c\n", InterfaceInfo->Pipes[PipeIndex].Interval);
+        DPRINT1("MaximumPacketSize %hu\n",
InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize);
+        DPRINT1("MaximumTransferSize %lu\n",
InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize);
+        DPRINT1("PipeFlags %lu\n",
InterfaceInfo->Pipes[PipeIndex].PipeFlags);
         DPRINT1("PipeType %d\n", InterfaceInfo->Pipes[PipeIndex].PipeType);
         DPRINT1("UsbEndPoint %x\n",
InterfaceInfo->Pipes[PipeIndex].EndpointAddress);