Changeset 9fe962d6 in mainline

Timestamp:

2008-06-03T14:42:21Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c70d693

Parents:

558c2bd

Message:

proper printf formatting

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (4 diffs)
• sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/ipc.c

@@ -563 +563 @@
                                 break;
                         }
-                        printf("active: %d\n",
+                        printf("active: %ld\n",
                             atomic_get(&task->phones[i].active_calls));
                 }
@@ -574 +574 @@
         printf("ABOX - CALLS:\n");
         for (tmp = task->answerbox.calls.next; tmp != &task->answerbox.calls;
-            tmp = tmp->next) {
+                tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d "
-                    "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid,
+                printf("Callid: %p Srctask:%" PRIu64 " M:%" PRIun 
+                        " A1:%" PRIun " A2:%" PRIun " A3:%" PRIun
+                    " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call, call->sender->taskid,
                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
@@ -585 +586 @@
         /* Print answerbox - calls */
         printf("ABOX - DISPATCHED CALLS:\n");
-        for (tmp = task->answerbox.dispatched_calls.next; 
-             tmp != &task->answerbox.dispatched_calls; 
-             tmp = tmp->next) {
+        for (tmp = task->answerbox.dispatched_calls.next;
+                tmp != &task->answerbox.dispatched_calls; 
+                tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d "
-                    "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid,
+                printf("Callid: %p Srctask:%" PRIu64 " M:%" PRIun
+                        " A1:%" PRIun " A2:%" PRIun " A3:%" PRIun
+                    " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call, call->sender->taskid,
                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
@@ -599 +601 @@
         printf("ABOX - ANSWERS:\n");
         for (tmp = task->answerbox.answers.next; tmp != &task->answerbox.answers;
-            tmp = tmp->next) {
+                tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid:%p M:%d A1:%d A2:%d A3:%d A4:%d A5:%d Flags:%x\n", 
+                printf("Callid:%p M:%" PRIun " A1:%" PRIun " A2:%" PRIun
+                        " A3:%" PRIun " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", 
                     call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),

kernel/generic/src/ipc/sysipc.c

@@ -427 +427 @@
         int res;
         int rc;
-
+        
         GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
@@ -627 +627 @@
                 ipc_answer(&TASK->answerbox, call);
                 return ENOENT;
-        });             
+        });
 
         if (!method_is_forwardable(IPC_GET_METHOD(call->data))) {