Changeset 46c20c8 in mainline for uspace/app/tester/tester.c

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 mainline changes.

File:

• uspace/app/tester/tester.c (modified) (5 diffs)

uspace/app/tester/tester.c

@@ -38 +38 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include "tester.h"
 
@@ -51 +51 @@
 #include "print/print3.def"
 #include "print/print4.def"
+#include "print/print5.def"
 #include "console/console1.def"
 #include "stdio/stdio1.def"
@@ -63 +64 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "hw/serial/serial1.def"
         {NULL, NULL, NULL, false}
 };
@@ -69 +71 @@
 {
         /* Execute the test */
-        char *ret = test->entry();
+        const char *ret = test->entry();
         
         if (ret == NULL) {
@@ -110 +112 @@
         }
         
+        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, "*");
 }