[haiku-commits] r38619 - haiku/trunk/src/kits/tracker
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 12 Sep 2010 17:09:14 +0200 (CEST)
Author: bonefish
Date: 2010-09-12 17:09:14 +0200 (Sun, 12 Sep 2010)
New Revision: 38619
Changeset: http://dev.haiku-os.org/changeset/38619
Modified:
haiku/trunk/src/kits/tracker/DeskWindow.cpp
haiku/trunk/src/kits/tracker/FSUtils.cpp
haiku/trunk/src/kits/tracker/FindPanel.cpp
haiku/trunk/src/kits/tracker/Model.cpp
haiku/trunk/src/kits/tracker/Tracker.cpp
haiku/trunk/src/kits/tracker/Utilities.cpp
haiku/trunk/src/kits/tracker/ViewState.cpp
Log:
Fixed debug build (format string/argument mismatches).
Modified: haiku/trunk/src/kits/tracker/DeskWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/DeskWindow.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/DeskWindow.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -195,7 +195,7 @@
// remove all current addon shortcuts
for (std::set<uint32>::iterator it=
fCurrentAddonShortcuts.begin();
it != fCurrentAddonShortcuts.end(); it++) {
- PRINT(("removing shortcut %c\n", *it));
+ PRINT(("removing shortcut %c\n", (int)*it));
RemoveShortcut(*it, B_OPTION_KEY | B_COMMAND_KEY);
}
Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -1493,8 +1493,8 @@
// entry is a mount point, do not copy it
if (statbuf.st_dev != sourceDeviceID) {
- PRINT(("Avoiding mount point %d, %d \n",
statbuf.st_dev,
- sourceDeviceID));
+ PRINT(("Avoiding mount point %" B_PRIdDEV ", %"
B_PRIdDEV "\n",
+ statbuf.st_dev, sourceDeviceID));
continue;
}
Modified: haiku/trunk/src/kits/tracker/FindPanel.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FindPanel.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/FindPanel.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -1220,7 +1220,8 @@
DEBUG_ONLY(time_t result =)
parsedate_etc(textControl->TextView()->Text(), -1, &flags);
dynamicDate = (flags &
PARSEDATE_RELATIVE_TIME) != 0;
- PRINT(("parsedate_etc - date is
%srelative, %l\n",
+ PRINT(("parsedate_etc - date is
%srelative, %"
+ B_PRIdTIME "\n",
dynamicDate ? "" : "not
", result));
query->PushDate(textControl->TextView()->Text());
Modified: haiku/trunk/src/kits/tracker/Model.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Model.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/Model.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -1252,7 +1252,8 @@
void
Model::PrintToStream(int32 level, bool deep)
{
- PRINT(("model name %s, entry name %s, inode %Lx, dev %x, directory
inode %Lx\n",
+ PRINT(("model name %s, entry name %s, inode %" B_PRIdINO ", dev %"
B_PRIdDEV
+ ", directory inode %" B_PRIdINO "\n",
Name() ? Name() : "**empty name**",
EntryRef()->name ? EntryRef()->name : "**empty ref name**",
NodeRef()->node,
@@ -1344,7 +1345,8 @@
if (IsNodeOpen()) {
node_ref nodeRef;
fNode->GetNodeRef(&nodeRef);
- PRINT(("node ref of open Node %Lx %x\n", nodeRef.node,
nodeRef.device));
+ PRINT(("node ref of open Node %" B_PRIdINO " %" B_PRIdDEV "\n",
+ nodeRef.node, nodeRef.device));
}
if (deep && IsSymLink()) {
Modified: haiku/trunk/src/kits/tracker/Tracker.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Tracker.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/Tracker.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -1499,7 +1499,7 @@
TTracker::NeedMoreNodeMonitors()
{
fNodeMonitorCount += kNodeMonitorBumpValue;
- PRINT(("bumping nodeMonitorCount to %d\n", fNodeMonitorCount));
+ PRINT(("bumping nodeMonitorCount to %" B_PRId32 "\n",
fNodeMonitorCount));
struct rlimit rl;
rl.rlim_cur = fNodeMonitorCount;
Modified: haiku/trunk/src/kits/tracker/Utilities.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Utilities.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/Utilities.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -1074,7 +1074,8 @@
if (length < 0 || length > 10000) {
// TODO: should fail here
- PRINT(("problems instatiating a string, length probably wrong
%d\n", length));
+ PRINT(("problems instatiating a string, length probably wrong %"
+ B_PRId32 "\n", length));
return;
}
@@ -1637,7 +1638,7 @@
_ThrowOnError(status_t error, const char *DEBUG_ONLY(file), int32
DEBUG_ONLY(line))
{
if (error != B_OK) {
- PRINT(("failing %s at %s:%d\n", strerror(error), file, line));
+ PRINT(("failing %s at %s:%d\n", strerror(error), file,
(int)line));
throw error;
}
}
@@ -1647,7 +1648,7 @@
_ThrowIfNotSize(ssize_t size, const char *DEBUG_ONLY(file), int32
DEBUG_ONLY(line))
{
if (size < B_OK) {
- PRINT(("failing %s at %s:%d\n", strerror(size), file, line));
+ PRINT(("failing %s at %s:%d\n", strerror(size), file,
(int)line));
throw (status_t)size;
}
}
@@ -1658,7 +1659,8 @@
const char *DEBUG_ONLY(file), int32 DEBUG_ONLY(line))
{
if (error != B_OK) {
- PRINT(("failing %s, %s at %s:%d\n", debugString,
strerror(error), file, line));
+ PRINT(("failing %s, %s at %s:%d\n", debugString,
strerror(error), file,
+ (int)line));
throw error;
}
}
Modified: haiku/trunk/src/kits/tracker/ViewState.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ViewState.cpp 2010-09-12 15:08:01 UTC (rev
38618)
+++ haiku/trunk/src/kits/tracker/ViewState.cpp 2010-09-12 15:09:14 UTC (rev
38619)
@@ -325,7 +325,7 @@
message.FindInt32(kViewStateViewModeName, (int32 *)&fViewMode);
message.FindInt32(kViewStateLastIconModeName, (int32 *)&fLastIconMode);
message.FindInt32(kViewStateLastIconSizeName,(int32 *)&fLastIconSize);
- message.FindInt32(kViewStateIconSizeName, (int32 *)&fIconSize);
+ message.FindInt32(kViewStateIconSizeName, (int32 *)&fIconSize);
message.FindPoint(kViewStateListOriginName, &fListOrigin);
message.FindPoint(kViewStateIconOriginName, &fIconOrigin);
message.FindInt32(kViewStatePrimarySortAttrName,
@@ -493,8 +493,9 @@
&& state->fLastIconMode != kIconMode
&& state->fLastIconMode != kMiniIconMode
&& state->fLastIconMode != 0)) {
- PRINT(("Bad data instantiating ViewState, view mode %x,
lastIconMode %x\n",
- state->fViewMode, state->fLastIconMode));
+ PRINT(("Bad data instantiating ViewState, view mode %" B_PRIx32
+ ", lastIconMode %" B_PRIx32 "\n", state->fViewMode,
+ state->fLastIconMode));
delete state;
return NULL;
Other related posts:
- » [haiku-commits] r38619 - haiku/trunk/src/kits/tracker - ingo_weinhold
