Changeset 59958992 in mainline for uspace/app/tmon/burst_tests.c

Timestamp:

2017-12-22T15:08:49Z (8 years ago)

Author:

Petr Mánek <petr.manek@…>

Branches:

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

Children:

8e16454

Parents:

acb9aa7

Message:

tmon: use ARRAY_SIZE to enumerate static arrays

File:

• uspace/app/tmon/burst_tests.c (modified) (2 diffs)

uspace/app/tmon/burst_tests.c

@@ -40 +40 @@
 #include <getopt.h>
 #include <usbdiag_iface.h>
+#include <macros.h>
 #include "commands.h"
 #include "tf.h"
@@ -115 +116 @@
         { .prefix = 'G', .factor = 1ul << 30 },
         { .prefix = 'M', .factor = 1ul << 20 },
-        { .prefix = 'k', .factor = 1ul << 10 },
-        { /* NULL-terminated */ }
+        { .prefix = 'k', .factor = 1ul << 10 }
 };
 
 static char * format_size(double size, const char *fmt)
 {
-        int i;
-        for (i = 0; units[i].prefix; ++i) {
+        unsigned i;
+        for (i = 0; i < ARRAY_SIZE(units); ++i) {
                 if (units[i].factor <= size)
                         break;
         }
 
-        char prefix[2] = { '\0', '\0' };
+        char prefix[] = { '\0', '\0' };
         double factor = 1;
 
-        if (units[i].prefix) {
+        if (i < ARRAY_SIZE(units)) {
                 prefix[0] = units[i].prefix;
                 factor = units[i].factor;