Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printf format warnings that were missed earlier (CIDs 715645-715657).

Browse Source
This commit is contained in:
Alex Smith 2012-08-18 10:27:52 +01:00
parent 173342c0ab
commit 7e5b39b672
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/drivers/input/usb_hid/HIDCollection.cpp
View File

@ -214,18 +214,18 @@ HIDCollection::PrintToStream(uint32 indentLevel)
TRACE_ALWAYS("%sHIDCollection %p\n", indent, this);
TRACE_ALWAYS("%s\ttype: %u %s\n", indent, fType, typeName);
TRACE_ALWAYS("%s\tusage: 0x%08lx\n", indent, fUsage);
TRACE_ALWAYS("%s\tusage: 0x%08" B_PRIx32 "\n", indent, fUsage);
TRACE_ALWAYS("%s\tstring id: %u\n", indent, fStringID);
TRACE_ALWAYS("%s\tphysical id: %u\n", indent, fPhysicalID);
TRACE_ALWAYS("%s\titem count: %lu\n", indent, fItemCount);
TRACE_ALWAYS("%s\titem count: %" B_PRIu32 "\n", indent, fItemCount);
for (uint32 i = 0; i < fItemCount; i++) {
HIDReportItem *item = fItems[i];
if (item != NULL)
item->PrintToStream(indentLevel + 1);
}
TRACE_ALWAYS("%s\tchild count: %lu\n", indent, fChildCount);
TRACE_ALWAYS("%s\tchild count: %" B_PRIu32 "\n", indent, fChildCount);
for (uint32 i = 0; i < fChildCount; i++) {
HIDCollection *child = fChildren[i];
if (child != NULL)

3
src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp
View File

@ -273,7 +273,8 @@ HIDDevice::MaybeScheduleTransfer()
status_t result = gUSBModule->queue_interrupt(fInterruptPipe,
fTransferBuffer, fTransferBufferSize, _TransferCallback, this);
if (result != B_OK) {
TRACE_ALWAYS("failed to schedule interrupt transfer 0x%08lx\n", result);
TRACE_ALWAYS("failed to schedule interrupt transfer 0x%08" B_PRIx32 "\n",
result);
return result;
}

8
src/add-ons/kernel/drivers/input/usb_hid/HIDReport.cpp
View File

@ -157,7 +157,7 @@ HIDReport::SetReport(status_t status, uint8 *report, size_t length)
fReportStatus = status;
fCurrentReport = report;
if (status == B_OK && length * 8 < fReportSize) {
TRACE_ALWAYS("report of %lu bits too small, expected %lu bits\n",
TRACE_ALWAYS("report of %lu bits too small, expected %" B_PRIu32 " bits\n",
length * 8, fReportSize);
fReportStatus = B_ERROR;
}
@ -276,10 +276,10 @@ HIDReport::PrintToStream()
TRACE_ALWAYS("\ttype: %u %s\n", fType, typeName);
TRACE_ALWAYS("\treport id: %u\n", fReportID);
TRACE_ALWAYS("\treport size: %lu bits = %lu bytes\n", fReportSize,
(fReportSize + 7) / 8);
TRACE_ALWAYS("\treport size: %" B_PRIu32 " bits = %" B_PRIu32 " bytes\n",
fReportSize, (fReportSize + 7) / 8);
TRACE_ALWAYS("\titem count: %lu\n", fItemsUsed);
TRACE_ALWAYS("\titem count: %" B_PRIu32 "\n", fItemsUsed);
for (uint32 i = 0; i < fItemsUsed; i++) {
HIDReportItem *item = fItems[i];
if (item != NULL)

12
src/add-ons/kernel/drivers/input/usb_hid/HIDReportItem.cpp
View File

@ -180,14 +180,14 @@ HIDReportItem::PrintToStream(uint32 indentLevel)
indent[indentLevel] = 0;
TRACE_ALWAYS("%sHIDReportItem %p\n", indent, this);
TRACE_ALWAYS("%s\tbyte offset: %lu\n", indent, fByteOffset);
TRACE_ALWAYS("%s\tbyte offset: %" B_PRIu32 "\n", indent, fByteOffset);
TRACE_ALWAYS("%s\tshift: %u\n", indent, fShift);
TRACE_ALWAYS("%s\tmask: 0x%08lx\n", indent, fMask);
TRACE_ALWAYS("%s\tmask: 0x%08" B_PRIx32 "\n", indent, fMask);
TRACE_ALWAYS("%s\thas data: %s\n", indent, fHasData ? "yes" : "no");
TRACE_ALWAYS("%s\tarray: %s\n", indent, fArray ? "yes" : "no");
TRACE_ALWAYS("%s\trelative: %s\n", indent, fRelative ? "yes" : "no");
TRACE_ALWAYS("%s\tminimum: %lu\n", indent, fMinimum);
TRACE_ALWAYS("%s\tmaximum: %lu\n", indent, fMaximum);
TRACE_ALWAYS("%s\tusage minimum: 0x%08lx\n", indent, fUsageMinimum);
TRACE_ALWAYS("%s\tusage maximum: 0x%08lx\n", indent, fUsageMaximum);
TRACE_ALWAYS("%s\tminimum: %" B_PRIu32 "\n", indent, fMinimum);
TRACE_ALWAYS("%s\tmaximum: %" B_PRIu32 "\n", indent, fMaximum);
TRACE_ALWAYS("%s\tusage minimum: 0x%08" B_PRIx32 "\n", indent, fUsageMinimum);
TRACE_ALWAYS("%s\tusage maximum: 0x%08" B_PRIx32 "\n", indent, fUsageMaximum);
}

2
src/add-ons/kernel/drivers/input/usb_hid/KeyboardProtocolHandler.cpp
View File

@ -425,7 +425,7 @@ KeyboardProtocolHandler::Control(uint32 *cookie, uint32 op, void *buffer,
return B_OK;
}
TRACE_ALWAYS("keyboard device unhandled control 0x%08lx\n", op);
TRACE_ALWAYS("keyboard device unhandled control 0x%08" B_PRIx32 "\n", op);
return B_ERROR;
}