Changeset 59958992 in mainline

Timestamp:

2017-12-22T15:08:49Z (6 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

Location:

uspace/app/tmon

Files:

• burst_tests.c (modified) (2 diffs)
• main.c (modified) (5 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;

uspace/app/tmon/main.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <macros.h>
 #include "commands.h"
 
@@ -82 +83 @@
                 .description = "Write to isochronous endpoint as fast as possible.",
                 .action = tmon_burst_isoch_out,
-        },
-        { /* NULL-terminated */ }
+        }
 };
 
@@ -102 +102 @@
                 .short_name = 's',
                 .description = "Set the data size transferred in a single cycle."
-        },
-        { /* NULL-terminated */ }
+        }
 };
 
@@ -111 +110 @@
         printf("Usage: %s command [device] [options]\n\n", app_name);
 
-        for (int i = 0; commands[i].name; ++i) {
+        for (unsigned i = 0; i < ARRAY_SIZE(commands); ++i) {
                 printf(INDENT "%s - %s\n", commands[i].name, commands[i].description);
         }
 
         puts("\n");
-        for (int i = 0; options[i].long_name; ++i) {
+        for (unsigned i = 0; i < ARRAY_SIZE(options); ++i) {
                 printf(INDENT "-%c --%s\n" INDENT INDENT "%s\n", options[i].short_name, options[i].long_name, options[i].description);
         }
@@ -127 +126 @@
         // Find a command to execute.
         tmon_cmd_t *cmd = NULL;
-        for (int i = 0; argc > 1 && commands[i].name; ++i) {
+        for (unsigned i = 0; argc > 1 && i < ARRAY_SIZE(commands); ++i) {
                 if (str_cmp(argv[1], commands[i].name) == 0) {
                         cmd = commands + i;