From 6d1eb1ce40801323b65401a70ae5f9782939eeb4 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sun, 3 Mar 2019 22:42:26 -0800
Subject: Consistently use ARRAY_LEN.

---
 toys/other/blkid.c   | 2 +-
 toys/other/modinfo.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'toys/other')

diff --git a/toys/other/blkid.c b/toys/other/blkid.c
index b791fa62..38559981 100644
--- a/toys/other/blkid.c
+++ b/toys/other/blkid.c
@@ -80,7 +80,7 @@ static void do_blkid(int fd, char *name)
     if (len != sizeof(toybuf)) return;
 
     // Iterate through types in range
-    for (i=0; i < sizeof(fstypes)/sizeof(struct fstype); i++) {
+    for (i=0; i<ARRAY_LEN(fstypes); i++) {
       uint64_t test;
 
       // Skip tests not in this 4k block
diff --git a/toys/other/modinfo.c b/toys/other/modinfo.c
index 126d1d63..eaf6cb98 100644
--- a/toys/other/modinfo.c
+++ b/toys/other/modinfo.c
@@ -51,18 +51,18 @@ static void modinfo_file(char *full_name)
   if (!buf) {
     perror_msg_raw(full_name);
     return;
-  } 
+  }
 
   output_field("filename", full_name);
 
   for (pos = buf; pos < buf+len; pos++) {
     if (*pos) continue;
 
-    for (i = 0; i < sizeof(modinfo_tags) / sizeof(*modinfo_tags); i++) {
+    for (i=0; i<ARRAY_LEN(modinfo_tags); i++) {
       char *str = modinfo_tags[i];
       int len = strlen(str);
 
-      if (!strncmp(pos+1, str, len) && pos[len+1] == '=') 
+      if (!strncmp(pos+1, str, len) && pos[len+1] == '=')
         output_field(str, pos+len+2);
     }
   }
-- 
cgit v1.2.3