Changeset bf61d3a in mainline for uspace/app/tester

Timestamp:

2010-11-26T01:34:21Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

273b958

Parents:

4b9a410 (diff), 7e752b2 (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 compile-time printf() argument checking, fixes of actual printf() arguments and related modifications

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• ipc/ping_pong.c (modified) (1 diff)
• ipc/register.c (modified) (3 diffs)
• print/print1.c (modified) (1 diff)
• print/print2.c (modified) (1 diff)
• print/print4.c (modified) (2 diffs)
• print/print5.c (added)
• print/print5.def (added)
• stdio/stdio1.c (modified) (1 diff)
• tester.c (modified) (2 diffs)
• tester.h (modified) (1 diff)
• thread/thread1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (2 diffs)

uspace/app/tester/Makefile

@@ -38 +38 @@
         print/print3.c \
         print/print4.c \
+        print/print5.c \
         console/console1.c \
         stdio/stdio1.c \

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/print/print1.c

@@ -49 +49 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
-        TPRINTF("Testing printf(\"%%s\", NULL):\n");
-        TPRINTF("Expected output: \"(NULL)\"\n");
-        TPRINTF("Real output:     \"%s\"\n\n", NULL);
-        
         return NULL;
 }

uspace/app/tester/print/print2.c

@@ -33 +33 @@
 const char *test_print2(void)
 {
-        TPRINTF("Testing printf(\"%%c %%3.2c %%-3.2c %%2.3c %%-2.3c\", 'a', 'b', 'c', 'd', 'e'):\n");
-        TPRINTF("Expected output: [a] [  b] [c  ] [ d] [e ]\n");
-        TPRINTF("Real output:     [%c] [%3.2c] [%-3.2c] [%2.3c] [%-2.3c]\n\n", 'a', 'b', 'c', 'd', 'e');
+        TPRINTF("Testing printf(\"%%c\", 'a'):\n");
+        TPRINTF("Expected output: [a]\n");
+        TPRINTF("Real output:     [%c]\n\n", 'a');
         
         TPRINTF("Testing printf(\"%%d %%3.2d %%-3.2d %%2.3d %%-2.3d\", 1, 2, 3, 4, 5):\n");

uspace/app/tester/print/print4.c

@@ -45 +45 @@
                 TPRINTF("  ");
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");
@@ -57 +57 @@
                 uint8_t index;
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wchar_t) ((group << 5) + index));
+                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
                 
                 TPRINTF("\n");

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

@@ -51 +51 @@
 #include "print/print3.def"
 #include "print/print4.def"
+#include "print/print5.def"
 #include "console/console1.def"
 #include "stdio/stdio1.def"
@@ -110 +111 @@
         }
         
+        unsigned int _len = (unsigned int) len;
+        if ((_len != len) || (((int) _len) < 0)) {
+                printf("Command length overflow\n");
+                return;
+        }
+        
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                    (test->safe ? "" : " (unsafe)"));
         
-        printf("%-*s Run all safe tests\n", len, "*");
+        printf("%-*s Run all safe tests\n", _len, "*");
 }
 

uspace/app/tester/tester.h

@@ -68 +68 @@
 extern const char *test_print3(void);
 extern const char *test_print4(void);
+extern const char *test_print5(void);
 extern const char *test_console1(void);
 extern const char *test_stdio1(void);

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);
         }

uspace/app/tester/vfs/vfs1.c

@@ -105 +105 @@
         if (cnt < 0)
                 return "write() failed";
-        TPRINTF("Written %d bytes\n", cnt);
+        TPRINTF("Written %zd bytes\n", cnt);
         
         if (lseek(fd0, 0, SEEK_SET) != 0)
@@ -116 +116 @@
                         return "read() failed";
                 
-                TPRINTF("Read %d bytes: \".*s\"\n", cnt, cnt, buf);
+                int _cnt = (int) cnt;
+                if (_cnt != cnt) {
+                        /* Count overflow, just to be sure. */
+                        TPRINTF("Read %zd bytes\n", cnt);
+                } else {
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
+                }
         }