Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision 6e3a44ab50a3067e6c8ff8affb5a71528cdca5a3)
+++ uspace/app/trace/trace.c	(revision 9ad5b5ccf49962c0f185225b4f87913ac4708164)
@@ -44,4 +44,5 @@
 #include <mem.h>
 #include <string.h>
+#include <bool.h>
 #include <loader/loader.h>
 #include <io/console.h>
@@ -69,13 +70,13 @@
 
 int phoneid;
-int abort_trace;
+bool abort_trace;
 
 uintptr_t thash;
-volatile int paused;
-fibril_condvar_t state_cv;
-fibril_mutex_t state_lock;
-
-int cev_valid;
-console_event_t cev;
+static bool paused;
+static fibril_condvar_t state_cv;
+static fibril_mutex_t state_lock;
+
+static bool cev_valid;
+static console_event_t cev;
 
 void thread_trace_start(uintptr_t thread_hash);
@@ -84,5 +85,5 @@
 static task_id_t task_id;
 static loader_t *task_ldr;
-static int task_wait_for;
+static bool task_wait_for;
 
 /** Combination of events/data to print. */
@@ -508,5 +509,5 @@
 				printf("Stop event\n");
 				fibril_mutex_lock(&state_lock);
-				paused = 1;
+				paused = true;
 				fibril_mutex_unlock(&state_lock);
 				break;
@@ -517,5 +518,5 @@
 				printf("Thread 0x%lx exited.\n", val0);
 				fibril_mutex_lock(&state_lock);
-				abort_trace = 1;
+				abort_trace = true;
 				fibril_condvar_broadcast(&state_cv);
 				fibril_mutex_unlock(&state_lock);
@@ -628,5 +629,5 @@
 
 		fibril_mutex_lock(&state_lock);
-		cev_valid = 1;
+		cev_valid = true;
 		fibril_condvar_broadcast(&state_cv);
 		fibril_mutex_unlock(&state_lock);		
@@ -655,5 +656,5 @@
 	}
 
-	abort_trace = 0;
+	abort_trace = false;
 
 	for (i = 0; i < n_threads; i++) {
@@ -694,5 +695,5 @@
 		case KC_R:
 			fibril_mutex_lock(&state_lock);
-			paused = 0;
+			paused = false;
 			fibril_condvar_broadcast(&state_cv);
 			fibril_mutex_unlock(&state_lock);
@@ -703,5 +704,5 @@
 
 	printf("\nTerminate debugging session...\n");
-	abort_trace = 1;
+	abort_trace = true;
 	udebug_end(phoneid);
 	ipc_hangup(phoneid);
@@ -735,6 +736,6 @@
 
 	next_thread_id = 1;
-	paused = 0;
-	cev_valid = 0;
+	paused = false;
+	cev_valid = false;
 
 	fibril_mutex_initialize(&state_lock);
@@ -862,5 +863,5 @@
 				task_id = strtol(*argv, &err_p, 10);
 				task_ldr = NULL;
-				task_wait_for = 0;
+				task_wait_for = false;
 				if (*err_p) {
 					printf("Task ID syntax error\n");
@@ -900,5 +901,5 @@
 	}
 	task_ldr = preload_task(*argv, argv, &task_id);
-	task_wait_for = 1;
+	task_wait_for = true;
 
 	return 0;