Changeset 7e752b2 in mainline for uspace/app/tester

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/tester

Files:

• ipc/ping_pong.c (modified) (1 diff)
• ipc/register.c (modified) (3 diffs)
• stdio/stdio1.c (modified) (1 diff)
• thread/thread1.c (modified) (2 diffs)

uspace/app/tester/ipc/ping_pong.c

@@ -72 +72 @@
         }
         
-        TPRINTF("OK\nCompleted %llu round trips in %u seconds, %llu rt/s.\n",
+        TPRINTF("OK\nCompleted %" PRIu64 " round trips in %u seconds, %" PRIu64 " rt/s.\n",
             count, DURATION_SECS, count / DURATION_SECS);
         

uspace/app/tester/ipc/register.c

@@ -27 +27 @@
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -41 +42 @@
         unsigned int i;
         
-        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
+        TPRINTF("Connected phone %" PRIun " accepting\n", icall->in_phone_hash);
         ipc_answer_0(iid, EOK);
         for (i = 0; i < MAX_CONNECTIONS; i++) {
@@ -57 +58 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
+                        TPRINTF("Phone %" PRIun " hung up\n", icall->in_phone_hash);
                         retval = 0;
                         break;
                 case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %#x: %#x\n",
+                        TPRINTF("Received well known message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, EOK);
                         break;
                 default:
-                        TPRINTF("Received unknown message from %#x: %#x\n",
+                        TPRINTF("Received unknown message from %" PRIun ": %" PRIun "\n",
                             icall->in_phone_hash, callid);
                         ipc_answer_0(callid, ENOENT);

uspace/app/tester/stdio/stdio1.c

@@ -60 +60 @@
         
         buf[cnt] = '\0';
-        TPRINTF("Read %u bytes, string \"%s\"\n", cnt, buf);
+        TPRINTF("Read %zu bytes, string \"%s\"\n", cnt, buf);
         
         TPRINTF("Seek to beginning...");

uspace/app/tester/thread/thread1.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include "../tester.h"
 
@@ -74 +75 @@
         atomic_set(&finish, 0);
         while (atomic_get(&threads_finished) < total) {
-                TPRINTF("Threads left: %u\n", total - atomic_get(&threads_finished));
+                TPRINTF("Threads left: %" PRIua "\n",
+                    total - atomic_get(&threads_finished));
                 sleep(1);
         }