From 07c6bd65b8aa82eae10c036e674799c1c5d16be9 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Mon, 23 Jul 2012 14:20:29 +0100
Subject: [PATCH] Format string fixes for TRACE_{THREAD,TEAM}.

---
 src/system/kernel/team.cpp   | 21 ++++++++++++---------
 src/system/kernel/thread.cpp | 14 ++++++++------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index 0373b55c43..acdc915f26 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -976,7 +976,7 @@ ProcessGroup::ProcessGroup(pid_t id)
 
 ProcessGroup::~ProcessGroup()
 {
-	TRACE(("ProcessGroup::~ProcessGroup(): id = %ld\n", group->id));
+	TRACE(("ProcessGroup::~ProcessGroup(): id = %" B_PRId32 "\n", id));
 
 	// If the group is in the orphaned check list, remove it.
 	MutexLocker orphanedCheckLocker(sOrphanedCheckLock);
@@ -1482,7 +1482,8 @@ team_create_thread_start_internal(void* args)
 	team = thread->team;
 	cache_node_launched(teamArgs->arg_count, teamArgs->flat_args);
 
-	TRACE(("team_create_thread_start: entry thread %ld\n", thread->id));
+	TRACE(("team_create_thread_start: entry thread %" B_PRId32 "\n",
+		thread->id));
 
 	// Main stack area layout is currently as follows (starting from 0):
 	//
@@ -1604,8 +1605,8 @@ load_image_internal(char**& _flatArgs, size_t flatArgsSize, int32 argCount,
 
 	const char* path = flatArgs[0];
 
-	TRACE(("load_image_internal: name '%s', args = %p, argCount = %ld\n",
-		path, flatArgs, argCount));
+	TRACE(("load_image_internal: name '%s', args = %p, argCount = %" B_PRId32
+		"\n", path, flatArgs, argCount));
 
 	// cut the path from the main thread name
 	const char* threadName = strrchr(path, '/');
@@ -1804,8 +1805,9 @@ exec_team(const char* path, char**& _flatArgs, size_t flatArgsSize,
 	const char* threadName;
 	thread_id nubThreadID = -1;
 
-	TRACE(("exec_team(path = \"%s\", argc = %ld, envCount = %ld): team %ld\n",
-		path, argCount, envCount, team->id));
+	TRACE(("exec_team(path = \"%s\", argc = %" B_PRId32 ", envCount = %"
+		B_PRId32 "): team %" B_PRId32 "\n", path, argCount, envCount,
+		team->id));
 
 	T(ExecTeam(path, argCount, flatArgs, envCount, flatArgs + argCount + 1));
 
@@ -1942,7 +1944,7 @@ fork_team(void)
 	status_t status;
 	int32 cookie;
 
-	TRACE(("fork_team(): team %ld\n", parentTeam->id));
+	TRACE(("fork_team(): team %" B_PRId32 "\n", parentTeam->id));
 
 	if (parentTeam == team_get_kernel_team())
 		return B_NOT_ALLOWED;
@@ -2304,7 +2306,8 @@ wait_for_child(pid_t child, uint32 flags, siginfo_t& _info)
 	struct job_control_entry* freeDeathEntry = NULL;
 	status_t status = B_OK;
 
-	TRACE(("wait_for_child(child = %ld, flags = %ld)\n", child, flags));
+	TRACE(("wait_for_child(child = %" B_PRId32 ", flags = %" B_PRId32 ")\n",
+		child, flags));
 
 	T(WaitForChild(child, flags));
 
@@ -4078,7 +4081,7 @@ _user_load_image(const char* const* userFlatArgs, size_t flatArgsSize,
 	int32 argCount, int32 envCount, int32 priority, uint32 flags,
 	port_id errorPort, uint32 errorToken)
 {
-	TRACE(("_user_load_image: argc = %ld\n", argCount));
+	TRACE(("_user_load_image: argc = %" B_PRId32 "\n", argCount));
 
 	if (argCount < 1)
 		return B_BAD_VALUE;
diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp
index 76cb73c156..0519230bf5 100644
--- a/src/system/kernel/thread.cpp
+++ b/src/system/kernel/thread.cpp
@@ -1889,8 +1889,8 @@ thread_exit(void)
 	struct thread_debug_info debugInfo;
 	team_id teamID = team->id;
 
-	TRACE(("thread %ld exiting w/return code %#lx\n", thread->id,
-		thread->exit.status));
+	TRACE(("thread %" B_PRId32 " exiting w/return code %#" B_PRIx32 "\n",
+		thread->id, thread->exit.status));
 
 	if (!are_interrupts_enabled())
 		panic("thread_exit() called with interrupts disabled!\n");
@@ -2095,7 +2095,8 @@ thread_exit(void)
 			kernelTeam->Unlock();
 		}
 
-		TRACE(("thread_exit: thread %ld now a kernel thread!\n", thread->id));
+		TRACE(("thread_exit: thread %" B_PRId32 " now a kernel thread!\n",
+			thread->id));
 	}
 
 	free(threadDeathEntry);
@@ -2232,7 +2233,7 @@ thread_at_kernel_entry(bigtime_t now)
 {
 	Thread *thread = thread_get_current_thread();
 
-	TRACE(("thread_at_kernel_entry: entry thread %ld\n", thread->id));
+	TRACE(("thread_at_kernel_entry: entry thread %" B_PRId32 "\n", thread->id));
 
 	// track user time
 	SpinLocker threadTimeLocker(thread->time_lock);
@@ -2255,7 +2256,7 @@ thread_at_kernel_exit(void)
 {
 	Thread *thread = thread_get_current_thread();
 
-	TRACE(("thread_at_kernel_exit: exit thread %ld\n", thread->id));
+	TRACE(("thread_at_kernel_exit: exit thread %" B_PRId32 "\n", thread->id));
 
 	handle_signals(thread);
 
@@ -2279,7 +2280,8 @@ thread_at_kernel_exit_no_signals(void)
 {
 	Thread *thread = thread_get_current_thread();
 
-	TRACE(("thread_at_kernel_exit_no_signals: exit thread %ld\n", thread->id));
+	TRACE(("thread_at_kernel_exit_no_signals: exit thread %" B_PRId32 "\n",
+		thread->id));
 
 	// track kernel time
 	bigtime_t now = system_time();