Fix various 64 bit related warnings
Mostly printf() format strings and signed-unsigned comparisons. Fixes the x86_64 build.
This commit is contained in:
@@ -1181,7 +1181,7 @@ ram_disk_raw_device_read(void* _cookie, off_t pos, void* buffer,
|
|||||||
|
|
||||||
if (pos >= device->DeviceSize())
|
if (pos >= device->DeviceSize())
|
||||||
return B_BAD_VALUE;
|
return B_BAD_VALUE;
|
||||||
if (pos + length > device->DeviceSize())
|
if (pos + (off_t)length > device->DeviceSize())
|
||||||
length = device->DeviceSize() - pos;
|
length = device->DeviceSize() - pos;
|
||||||
|
|
||||||
IORequest request;
|
IORequest request;
|
||||||
@@ -1211,7 +1211,7 @@ ram_disk_raw_device_write(void* _cookie, off_t pos, const void* buffer,
|
|||||||
|
|
||||||
if (pos >= device->DeviceSize())
|
if (pos >= device->DeviceSize())
|
||||||
return B_BAD_VALUE;
|
return B_BAD_VALUE;
|
||||||
if (pos + length > device->DeviceSize())
|
if (pos + (off_t)length > device->DeviceSize())
|
||||||
length = device->DeviceSize() - pos;
|
length = device->DeviceSize() - pos;
|
||||||
|
|
||||||
IORequest request;
|
IORequest request;
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ public:
|
|||||||
return B_BAD_VALUE;
|
return B_BAD_VALUE;
|
||||||
|
|
||||||
size_t toCopy = *bufferSize;
|
size_t toCopy = *bufferSize;
|
||||||
if (offset + toCopy > size)
|
if (offset + (off_t)toCopy > size)
|
||||||
toCopy = size - offset;
|
toCopy = size - offset;
|
||||||
|
|
||||||
if (toCopy > 0)
|
if (toCopy > 0)
|
||||||
|
|||||||
@@ -109,23 +109,24 @@ void dbg_printf_end();
|
|||||||
#define DEBUG_CONTEXT(x) \
|
#define DEBUG_CONTEXT(x) \
|
||||||
{ \
|
{ \
|
||||||
dbg_printf_begin(); \
|
dbg_printf_begin(); \
|
||||||
__out(DEBUG_APP " [%Ld: %5ld] ", system_time(), DEBUG_THREAD); \
|
__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] ", \
|
||||||
|
system_time(), DEBUG_THREAD); \
|
||||||
x; \
|
x; \
|
||||||
dbg_printf_end(); \
|
dbg_printf_end(); \
|
||||||
}
|
}
|
||||||
#define DEBUG_CONTEXT_FUNCTION(prefix, x) \
|
#define DEBUG_CONTEXT_FUNCTION(prefix, x) \
|
||||||
{ \
|
{ \
|
||||||
dbg_printf_begin(); \
|
dbg_printf_begin(); \
|
||||||
__out(DEBUG_APP " [%Ld: %5ld] %s" prefix, system_time(), DEBUG_THREAD, \
|
__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s" prefix, \
|
||||||
__PRETTY_FUNCTION__); \
|
system_time(), DEBUG_THREAD, __PRETTY_FUNCTION__); \
|
||||||
x; \
|
x; \
|
||||||
dbg_printf_end(); \
|
dbg_printf_end(); \
|
||||||
}
|
}
|
||||||
#define DEBUG_CONTEXT_LINE(x) \
|
#define DEBUG_CONTEXT_LINE(x) \
|
||||||
{ \
|
{ \
|
||||||
dbg_printf_begin(); \
|
dbg_printf_begin(); \
|
||||||
__out(DEBUG_APP " [%Ld: %5ld] %s:%d: ", system_time(), DEBUG_THREAD, \
|
__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s:%d: ", \
|
||||||
__PRETTY_FUNCTION__, __LINE__); \
|
system_time(), DEBUG_THREAD, __PRETTY_FUNCTION__, __LINE__); \
|
||||||
x; \
|
x; \
|
||||||
dbg_printf_end(); \
|
dbg_printf_end(); \
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -800,7 +800,7 @@ Volume::_AddInitialPackagesFromActivationFile()
|
|||||||
RETURN_ERROR(errno);
|
RETURN_ERROR(errno);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (st.st_size > kMaxActivationFileSize) {
|
if (st.st_size > (off_t)kMaxActivationFileSize) {
|
||||||
ERROR("The packages activation file is too big.\n");
|
ERROR("The packages activation file is too big.\n");
|
||||||
RETURN_ERROR(B_BAD_DATA);
|
RETURN_ERROR(B_BAD_DATA);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -621,8 +621,9 @@ class SendSignal : public AbstractTraceEntry {
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("signal send: target: %ld, signal: %lu (%s), "
|
out.Print("signal send: target: %" B_PRId32 ", signal: %" B_PRIu32
|
||||||
"flags: 0x%lx", fTarget, fSignal, signal_name(fSignal), fFlags);
|
" (%s), flags: %#" B_PRIx32, fTarget, fSignal,
|
||||||
|
signal_name(fSignal), fFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -644,10 +645,10 @@ class SigAction : public AbstractTraceEntry {
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("signal action: signal: %lu (%s), "
|
out.Print("signal action: signal: %" B_PRIu32 " (%s), "
|
||||||
"action: {handler: %p, flags: 0x%x, mask: 0x%llx}", fSignal,
|
"action: {handler: %p, flags: %#x, mask: %#" B_PRIx64 "}",
|
||||||
signal_name(fSignal), fAction.sa_handler, fAction.sa_flags,
|
fSignal, signal_name(fSignal), fAction.sa_handler,
|
||||||
(long long)fAction.sa_mask);
|
fAction.sa_flags, (uint64)fAction.sa_mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ class PreSyscall : public AbstractTraceEntry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (printValue)
|
if (printValue)
|
||||||
out.Print("%s0x%llx", (i == 0 ? "" : ", "), value);
|
out.Print("%s%#" B_PRIx64, (i == 0 ? "" : ", "), value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -448,7 +448,7 @@ class PostSyscall : public AbstractTraceEntry {
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("syscall post: %s() -> 0x%llx",
|
out.Print("syscall post: %s() -> %#" B_PRIx64,
|
||||||
get_syscall_name(fSyscall), fReturnValue);
|
get_syscall_name(fSyscall), fReturnValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("team forked, new thread %ld", fForkedThread);
|
out.Print("team forked, new thread %" B_PRId32, fForkedThread);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -310,7 +310,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("team set job control state, team %ld, "
|
out.Print("team set job control state, team %" B_PRId32 ", "
|
||||||
"new state: %s, signal: %d",
|
"new state: %s, signal: %d",
|
||||||
fTeam, job_control_state_name(fNewState), fSignal);
|
fTeam, job_control_state_name(fNewState), fSignal);
|
||||||
}
|
}
|
||||||
@@ -334,8 +334,8 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("team wait for child, child: %ld, "
|
out.Print("team wait for child, child: %" B_PRId32 ", "
|
||||||
"flags: 0x%lx", fChild, fFlags);
|
"flags: %#" B_PRIx32, fChild, fFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -367,13 +367,13 @@ public:
|
|||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
if (fTeam >= 0) {
|
if (fTeam >= 0) {
|
||||||
out.Print("team wait for child done, team: %ld, "
|
out.Print("team wait for child done, team: %" B_PRId32 ", "
|
||||||
"state: %s, status: 0x%lx, reason: 0x%x, signal: %d\n",
|
"state: %s, status: %#" B_PRIx32 ", reason: %#x, signal: %d\n",
|
||||||
fTeam, job_control_state_name(fState), fStatus, fReason,
|
fTeam, job_control_state_name(fState), fStatus, fReason,
|
||||||
fSignal);
|
fSignal);
|
||||||
} else {
|
} else {
|
||||||
out.Print("team wait for child failed, error: "
|
out.Print("team wait for child failed, error: "
|
||||||
"0x%lx, ", fTeam);
|
"%#" B_PRIx32 ", ", fTeam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -155,8 +155,8 @@ class SetMinimalCommitment : public VMCacheTraceEntry {
|
|||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("vm cache set min commitment: cache: %p, "
|
out.Print("vm cache set min commitment: cache: %p, "
|
||||||
"commitment: %lld -> %lld", fCache, fOldCommitment,
|
"commitment: %" B_PRIdOFF " -> %" B_PRIdOFF, fCache,
|
||||||
fCommitment);
|
fOldCommitment, fCommitment);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -178,8 +178,8 @@ class Resize : public VMCacheTraceEntry {
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("vm cache resize: cache: %p, size: %lld -> %lld", fCache,
|
out.Print("vm cache resize: cache: %p, size: %" B_PRIdOFF " -> %"
|
||||||
fOldSize, fSize);
|
B_PRIdOFF, fCache, fOldSize, fSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -323,8 +323,8 @@ class InsertPage : public VMCacheTraceEntry {
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("vm cache insert page: cache: %p, page: %p, offset: %lld",
|
out.Print("vm cache insert page: cache: %p, page: %p, offset: %"
|
||||||
fCache, fPage, fOffset);
|
B_PRIdOFF, fCache, fPage, fOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -272,7 +272,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("page reserve: %lu", fCount);
|
out.Print("page reserve: %" B_PRIu32, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -291,7 +291,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("page unreserve: %lu", fCount);
|
out.Print("page unreserve: %" B_PRId32, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -376,7 +376,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("page scrubbing: %lu", fCount);
|
out.Print("page scrubbing: %" B_PRId32, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -395,7 +395,7 @@ public:
|
|||||||
|
|
||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
out.Print("page scrubbed: %lu", fCount);
|
out.Print("page scrubbed: %" B_PRId32, fCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ class SelectBegin : public SelectTraceEntry {
|
|||||||
virtual void AddDump(TraceOutput& out)
|
virtual void AddDump(TraceOutput& out)
|
||||||
{
|
{
|
||||||
SelectTraceEntry::AddDump(out, "select begin: ");
|
SelectTraceEntry::AddDump(out, "select begin: ");
|
||||||
out.Print(", timeout: %lld", fTimeout);
|
out.Print(", timeout: %" B_PRIdBIGTIME, fTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -213,7 +213,7 @@ class SelectDone : public SelectTraceEntry {
|
|||||||
if (fStatus == B_OK)
|
if (fStatus == B_OK)
|
||||||
SelectTraceEntry::AddDump(out, "select done: ");
|
SelectTraceEntry::AddDump(out, "select done: ");
|
||||||
else
|
else
|
||||||
out.Print("select done: error: 0x%lx", fStatus);
|
out.Print("select done: error: %#" B_PRIx32, fStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -319,7 +319,7 @@ class PollBegin : public PollTraceEntry {
|
|||||||
{
|
{
|
||||||
out.Print("poll begin: ");
|
out.Print("poll begin: ");
|
||||||
PollTraceEntry::AddDump(out);
|
PollTraceEntry::AddDump(out);
|
||||||
out.Print(", timeout: %lld", fTimeout);
|
out.Print(", timeout: %" B_PRIdBIGTIME, fTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -343,7 +343,7 @@ class PollDone : public PollTraceEntry {
|
|||||||
out.Print("poll done: count: %d: ", fResult);
|
out.Print("poll done: count: %d: ", fResult);
|
||||||
PollTraceEntry::AddDump(out);
|
PollTraceEntry::AddDump(out);
|
||||||
} else
|
} else
|
||||||
out.Print("poll done: error: 0x%x", fResult);
|
out.Print("poll done: error: %#x", fResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
Reference in New Issue
Block a user