Changeset 7e752b2 in mainline for uspace/app/trace

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

uspace/app/trace

Files:

• ipcp.c (modified) (4 diffs)
• trace.c (modified) (13 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;

uspace/app/trace/trace.c

@@ -161 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -200 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
-        }
-        printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
+                printf(" [%d] (hash %p)", 1 + i, (void *) thread_hash_buf[i]);
+        }
+        printf("\ntotal of %zu threads\n", tb_needed / sizeof(uintptr_t));
 
         return 0;
@@ -224 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("%p", val);
+                printf("%p", (void *) val);
                 break;
 
@@ -248 +248 @@
         case V_CHAR:
                 if (sval >= 0x20 && sval < 0x7f) {
-                        printf("'%c'", sval);
+                        printf("'%c'", (char) sval);
                 } else {
                         switch (sval) {
@@ -257 +257 @@
                         case '\t': printf("'\\t'"); break;
                         case '\\': printf("'\\\\'"); break;
-                        default: printf("'\\x%02lX'", val); break;
+                        default: printf("'\\x%02" PRIxn "'", val); break;
                         }
                 }
@@ -277 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
+        if (n > 0) printf("%" PRIun, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %" PRIdSYSARG, sc_args[i]);
+                printf(", %" PRIun, sc_args[i]);
         }
         putchar(')');
@@ -489 +489 @@
 {
         async_serialize_start();
-        printf("New thread, hash 0x%lx\n", hash);
+        printf("New thread, hash %p\n", (void *) hash);
         async_serialize_end();
 
@@ -510 +510 @@
         }
 
-        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
+        printf("Start tracing thread [%u] (hash %p).\n",
+            thread_id, (void *) thread_hash);
 
         while (!abort_trace) {
@@ -516 +517 @@
                 fibril_mutex_lock(&state_lock);
                 if (paused) {
-                        printf("Thread [%d] paused. Press R to resume.\n",
+                        printf("Thread [%u] paused. Press R to resume.\n",
                             thread_id);
 
@@ -522 +523 @@
                                 fibril_condvar_wait(&state_cv, &state_lock);
 
-                        printf("Thread [%d] resumed.\n", thread_id);
+                        printf("Thread [%u] resumed.\n", thread_id);
                 }
                 fibril_mutex_unlock(&state_lock);
@@ -554 +555 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread %p exited.\n", val0);
+                                printf("Thread %" PRIun " exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -927 +928 @@
                                 }
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -984 +985 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %" PRIdTASKID ".\n", task_id);
+        printf("Connected to task %" PRIu64 ".\n", task_id);
 
         if (task_ldr != NULL)