cleanup __arraycount

diff --git a/src/cdf_time.c b/src/cdf_time.c
index bdb2d3a2e6eb40900fc382d942ced56de921ef13..e4eea4c737f39941f771fb1e792ccd5c810b2998 100644 (file)
--- a/src/cdf_time.c
+++ b/src/cdf_time.c
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf_time.c,v 1.18 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: cdf_time.c,v 1.19 2019/03/12 20:43:05 christos Exp $")
 #endif
 
 #include <time.h>
@@ -68,7 +68,7 @@ cdf_getday(int year, int days)
 {
        size_t m;
 
-       for (m = 0; m < sizeof(mdays) / sizeof(mdays[0]); m++) {
+       for (m = 0; m < __arraycount(mdays); m++) {
                int sub = mdays[m] + (m == 1 && isleap(year));
                if (days < sub)
                        return days;
@@ -85,7 +85,7 @@ cdf_getmonth(int year, int days)
 {
        size_t m;
 
-       for (m = 0; m < sizeof(mdays) / sizeof(mdays[0]); m++) {
+       for (m = 0; m < __arraycount(mdays); m++) {
                days -= mdays[m];
                if (m == 1 && isleap(year))
                        days--;

diff --git a/src/compress.c b/src/compress.c
index 89fc57018fa3610cfe71cbe7ee24c84fa1e0d812..cad371e60ecfc3e1976d6c84bb54ad65bebc683e 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.115 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.116 2019/03/12 20:43:05 christos Exp $")
 #endif
 
 #include "magic.h"
@@ -179,7 +179,7 @@ private const struct {
 
 private ssize_t swrite(int, const void *, size_t);
 #if HAVE_FORK
-private size_t ncompr = sizeof(compr) / sizeof(compr[0]);
+private size_t ncompr = __arraycount(compr);
 private int uncompressbuf(int, size_t, size_t, const unsigned char *,
     unsigned char **, size_t *);
 #ifdef BUILTIN_DECOMPRESS

diff --git a/src/file.c b/src/file.c
index 5f0303e40ff139ad78051db0da04cab80cc82a53..abf0bf417273de5733e9513706d0423892a2816d 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.179 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.180 2019/03/12 20:43:05 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -244,11 +244,11 @@ main(int argc, char *argv[])
                        flags |= MAGIC_ERROR;
                        break;
                case 'e':
-                       for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
+                       for (i = 0; i < __arraycount(nv); i++)
                                if (strcmp(nv[i].name, optarg) == 0)
                                        break;
 
-                       if (i == sizeof(nv) / sizeof(nv[0]))
+                       if (i == __arraycount(nv))
                                errflg++;
                        else
                                flags |= nv[i].value;

diff --git a/src/print.c b/src/print.c
index 6dad1de66de331b3c62ce83f86ae8ecf88d2d7a5..391a7fbe15621cee21e6ce2355c682adb8806678 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.84 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: print.c,v 1.85 2019/03/12 20:43:05 christos Exp $")
 #endif  /* lint */
 
 #include <string.h>
@@ -43,8 +43,6 @@ FILE_RCSID("@(#)$File: print.c,v 1.84 2019/02/20 02:35:27 christos Exp $")
 #endif
 #include <time.h>
 
-#define SZOF(a)        (sizeof(a) / sizeof(a[0]))
-
 #include "cdf.h"
 
 #ifndef COMPILE_ONLY
@@ -66,8 +64,8 @@ file_mdump(struct magic *m)
                        (void) fputc('~', stderr);
                (void) fprintf(stderr, "%c%u),",
                    (CAST(size_t, m->in_op & FILE_OPS_MASK) <
-                   SZOF(optyp)) ? optyp[m->in_op & FILE_OPS_MASK] : '?',
-                   m->in_offset);
+                   __arraycount(optyp)) ?
+                   optyp[m->in_op & FILE_OPS_MASK] : '?', m->in_offset);
        }
        (void) fprintf(stderr, " %s%s", (m->flag & UNSIGNED) ? "u" : "",
            /* Note: type is unsigned */
@@ -112,7 +110,8 @@ file_mdump(struct magic *m)
                        (void) fprintf(stderr, "/%u", m->str_range);
        }
        else {
-               if (CAST(size_t, m->mask_op & FILE_OPS_MASK) < SZOF(optyp))
+               if (CAST(size_t, m->mask_op & FILE_OPS_MASK) <
+                   __arraycount(optyp))
                        (void) fputc(optyp[m->mask_op & FILE_OPS_MASK], stderr);
                else
                        (void) fputc('?', stderr);

diff --git a/src/readcdf.c b/src/readcdf.c
index 5fa98e8f9046c29265e4d72f25a86f36722be0f9..e6ea8e47fb6b499902bfe20c04e70c0fa4807080 100644 (file)
--- a/src/readcdf.c
+++ b/src/readcdf.c
@@ -26,7 +26,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readcdf.c,v 1.72 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: readcdf.c,v 1.73 2019/03/12 20:43:05 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -39,10 +39,6 @@ FILE_RCSID("@(#)$File: readcdf.c,v 1.72 2019/02/20 02:35:27 christos Exp $")
 #include "cdf.h"
 #include "magic.h"
 
-#ifndef __arraycount
-#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
-#endif
-
 #define NOTMIME(ms) (((ms)->flags & MAGIC_MIME) == 0)
 
 static const struct nv {

diff --git a/src/readelf.c b/src/readelf.c
index db43c6c8f239c0905a93cf4b2de13b6429fe90d7..e80e33e30758ba645bda6990262f27466f0a9c74 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.162 2019/02/20 02:35:27 christos Exp $")
+FILE_RCSID("@(#)$File: readelf.c,v 1.163 2019/03/12 20:43:05 christos Exp $")
 #endif
 
 #ifdef BUILTIN_ELF
@@ -285,8 +285,8 @@ static const size_t prpsoffsets64[] = {
        16,             /* FreeBSD, 64-bit */
 };
 
-#define        NOFFSETS32      (sizeof(prpsoffsets32) / sizeof(prpsoffsets32[0]))
-#define NOFFSETS64     (sizeof(prpsoffsets64) / sizeof(prpsoffsets64[0]))
+#define        NOFFSETS32      __arraycount(prpsoffsets32)
+#define NOFFSETS64     __arraycount(prpsoffsets64)
 
 #define NOFFSETS       (clazz == ELFCLASS32 ? NOFFSETS32 : NOFFSETS64)