Changeset ba519f7 in mainline for uspace/app/trace/ipcp.c

Timestamp:

2010-12-02T17:21:30Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3bd76491

Parents:

8ad673a (diff), 41a7f62 (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 from mainline

File:

• uspace/app/trace/ipcp.c (modified) (4 diffs)

uspace/app/trace/ipcp.c

@@ -137 +137 @@
 
         if (oper != NULL) {
-                printf("%s (%ld)", oper->name, method);
+                printf("%s (%" PRIun ")", oper->name, method);
                 return;
         }
 
-        printf("%ld", method);
+        printf("%" PRIun, method);
 }
 
@@ -201 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
-                        phone, (proto ? proto->name : "n/a"));
+                printf("Call ID: %p, phone: %d, proto: %s, method: ",
+                    (void *) hash, phone,
+                    (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
-                    args[3], args[4], args[5]);
+                printf(" args: (%" PRIun ", %" PRIun ", %" PRIun ", "
+                    "%" PRIun ", %" PRIun ")\n",
+                    args[1], args[2], args[3], args[4], args[5]);
         }
 
@@ -281 +282 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
-                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
-                    ", %" PRIuIPCARG ")\n",
-                    hash, retval, IPC_GET_ARG1(*answer),
+                printf("Response to %p: retval=%" PRIdn ", args = (%" PRIun ", "
+                    "%" PRIun ", %" PRIun ", %" PRIun ", %" PRIun ")\n",
+                    (void *) hash, retval, IPC_GET_ARG1(*answer),
                     IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
                     IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
@@ -340 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash %p)\n", hash);
+                        printf("Not a response (hash %p)\n", (void *) hash);
                 }
                 return;