Changeset 713ba400 in mainline

Timestamp:

2019-01-01T19:53:07Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

858469f

Parents:

32236e5

Message:

Refactoring in tester and perf

Use can_cast_size_t_to_int instead of the body of this function.

Also replaced "if" with assert() as the overflow (see diff) can rarely
happen and actually denotes a problem with the test itself (really,
test name longer than MAX_INT is insane).

Notice how the code from kernel was ported to userspace without changes
to the error text that would printed .

Location:

uspace/app

Files:

• perf/perf.c (modified) (3 diffs)
• tester/tester.c (modified) (3 diffs)

uspace/app/perf/perf.c

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -42 +43 @@
 #include <errno.h>
 #include <perf.h>
+#include <types/casting.h>
 #include "perf.h"
 #include "benchlist.h"
@@ -226 +228 @@
         }
 
-        unsigned int _len = (unsigned int) len;
-        if ((_len != len) || (((int) _len) < 0)) {
-                printf("Command length overflow\n");
-                return;
-        }
+        assert(can_cast_size_t_to_int(len) && "benchmark name length overflow");
 
         for (size_t i = 0; i < benchmark_count; i++)
-                printf("%-*s %s\n", _len, benchmarks[i]->name, benchmarks[i]->desc);
-
-        printf("%-*s Run all benchmarks\n", _len, "*");
+                printf("%-*s %s\n", (int) len, benchmarks[i]->name, benchmarks[i]->desc);
+
+        printf("%-*s Run all benchmarks\n", (int) len, "*");
 }
 

uspace/app/tester/tester.c

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -40 +41 @@
 #include <str.h>
 #include <io/log.h>
+#include <types/casting.h>
 #include "tester.h"
 
@@ -144 +146 @@
         }
 
-        unsigned int _len = (unsigned int) len;
-        if ((_len != len) || (((int) _len) < 0)) {
-                printf("Command length overflow\n");
-                return;
-        }
+        assert(can_cast_size_t_to_int(len) && "test name length overflow");
 
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                printf("%-*s %s%s\n", (int) len, test->name, test->desc,
                     (test->safe ? "" : " (unsafe)"));
 
-        printf("%-*s Run all safe tests\n", _len, "*");
+        printf("%-*s Run all safe tests\n", (int) len, "*");
 }