Changeset d16fc78 in mainline for uspace

Timestamp:

2010-11-26T01:07:42Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

855e0d8

Parents:

1e27d85

Message:

• verify the correctness of printf()'s and friends' attributes in compile time (use NVERIFY_PRINTF define to suppress the checks)
• separate non-C99 compliant printf() checks to a standalone 'print5' test and u

se NVERIFY_PRINTF for it

• improve 'print2' test (use portable constant macros and explicit types)

Location:

uspace/app/tester/print

Files:

• print1.c (modified) (1 diff)
• print2.c (modified) (1 diff)
• print4.c (modified) (2 diffs)
• print5.c (added)
• print5.def (added)

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