Changeset 19f24fd in mainline for uspace/app/trace/ipcp.c

Timestamp:

2010-02-05T22:25:52Z (15 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/app/trace/ipcp.c (modified) (4 diffs)

uspace/app/trace/ipcp.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <adt/hash_table.h>
+#include <sys/typefmt.h>
 
 #include "ipc_desc.h"
@@ -200 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
+                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
                         phone, (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
+                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
                     args[3], args[4], args[5]);
         }
@@ -279 +281 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
-                        hash, retval, IPC_GET_ARG1(*answer),
-                        IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
-                        IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
+                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ")\n",
+                    hash, retval, IPC_GET_ARG1(*answer),
+                    IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
+                    IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
         }
 
@@ -336 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash 0x%lx)\n", hash);
+                        printf("Not a response (hash %p)\n", hash);
                 }
                 return;