Changeset 19f24fd in mainline for uspace/srv/taskmon/taskmon.c

Timestamp:

2010-02-05T22:25:52Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/taskmon/taskmon.c (modified) (2 diffs)

uspace/srv/taskmon/taskmon.c

@@ -39 +39 @@
 #include <async.h>
 #include <ipc/services.h>
+#include <sys/typefmt.h>
 #include <task.h>
 #include <event.h>
@@ -60 +61 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%lld", taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
+        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
 #ifdef CONFIG_VERBOSE_DUMPS