man/: EXAMPLES: Use NITEMS() consistently

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/man/man2/bpf.2 b/man/man2/bpf.2
index 3bfda0df7cda3895e0c7832decdb27a85db3ba38..d3f2748a377b97d5f9d2e9647fc8f66813e79a9f 100644 (file)
--- a/man/man2/bpf.2
+++ b/man/man2/bpf.2
@@ -1193,6 +1193,8 @@ riscv (since Linux 5.1).
 .SH EXAMPLES
 .\" SRC BEGIN (bpf.c)
 .EX
+#define NITEMS(a)  (sizeof(a) / sizeof(*(a)))
+\&
 /* bpf+sockets example:
  * 1. create array map of 256 elements
  * 2. load program that counts number of packets received
@@ -1237,7 +1239,7 @@ main(int argc, char *argv[])
     };
 \&
     prog_fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, prog,
-                            sizeof(prog) / sizeof(prog[0]), "GPL");
+                            NITEMS(prog), "GPL");
 \&
     sock = open_raw_sock("lo");
 \&

diff --git a/man/man2/seccomp.2 b/man/man2/seccomp.2
index 9147fd7efe1adec7297c562cc69f48e7894e933d..5e65d6a283068758b04e1c1f2a56df5dd3889fae 100644 (file)
--- a/man/man2/seccomp.2
+++ b/man/man2/seccomp.2
@@ -1114,7 +1114,7 @@ cecilia
 #include <unistd.h>
 \&
 #define X32_SYSCALL_BIT 0x40000000
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof(arr) / sizeof((arr)[0]))
 \&
 static int
 install_filter(int syscall_nr, unsigned int t_arch, int f_errno)
@@ -1165,7 +1165,7 @@ install_filter(int syscall_nr, unsigned int t_arch, int f_errno)
     };
 \&
     struct sock_fprog prog = {
-        .len = ARRAY_SIZE(filter),
+        .len = NITEMS(filter),
         .filter = filter,
     };
 \&

diff --git a/man/man2/seccomp_unotify.2 b/man/man2/seccomp_unotify.2
index f84397c21e6a3a31152f682b842d420a1009b3bc..31a9657ac187d4471154139c35e5370ad02031ba 100644 (file)
--- a/man/man2/seccomp_unotify.2
+++ b/man/man2/seccomp_unotify.2
@@ -1419,7 +1419,7 @@ T: terminating
 #include <sys/un.h>
 #include <unistd.h>
 \&
-#define ARRAY_SIZE(arr)  (sizeof(arr) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof(arr) / sizeof((arr)[0]))
 \&
 /* Send the file descriptor \[aq]fd\[aq] over the connected UNIX domain socket
    \[aq]sockfd\[aq]. Returns 0 on success, or \-1 on error. */
@@ -1600,7 +1600,7 @@ installNotifyFilter(void)
     };
 \&
     struct sock_fprog prog = {
-        .len = ARRAY_SIZE(filter),
+        .len = NITEMS(filter),
         .filter = filter,
     };
 \&

diff --git a/man/man2/sysctl.2 b/man/man2/sysctl.2
index c3f3aca41c510b1931beb297cf5067ec3176f17f..c59acff553d424b1c6defa8e0676b367aaab1a8d 100644 (file)
--- a/man/man2/sysctl.2
+++ b/man/man2/sysctl.2
@@ -120,7 +120,7 @@ It is not yet possible to change operating system by writing to
 \&
 #include <linux/sysctl.h>
 \&
-#define ARRAY_SIZE(arr)  (sizeof(arr) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof(arr) / sizeof((arr)[0]))
 \&
 int _sysctl(struct __sysctl_args *args);
 \&
@@ -136,7 +136,7 @@ main(void)
 \&
     memset(&args, 0, sizeof(args));
     args.name = name;
-    args.nlen = ARRAY_SIZE(name);
+    args.nlen = NITEMS(name);
     args.oldval = osname;
     args.oldlenp = &osnamelth;
 \&

diff --git a/man/man3/bsearch.3 b/man/man3/bsearch.3
index 03b00d9aad8d3cb278ecf274f0f7a1ea11ad9151..a62954c1ee6150cfe0364ae6b58a7d1b15765d24 100644 (file)
--- a/man/man3/bsearch.3
+++ b/man/man3/bsearch.3
@@ -84,7 +84,7 @@ then retrieves desired elements using
 #include <stdlib.h>
 #include <string.h>
 \&
-#define ARRAY_SIZE(arr)  (sizeof((arr)) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof((arr)) / sizeof((arr)[0]))
 \&
 struct mi {
     int         nr;
@@ -109,13 +109,13 @@ compmi(const void *m1, const void *m2)
 int
 main(int argc, char *argv[])
 {
-    qsort(months, ARRAY_SIZE(months), sizeof(months[0]), compmi);
+    qsort(months, NITEMS(months), sizeof(months[0]), compmi);
     for (size_t i = 1; i < argc; i++) {
         struct mi key;
         struct mi *res;
 \&
         key.name = argv[i];
-        res = bsearch(&key, months, ARRAY_SIZE(months),
+        res = bsearch(&key, months, NITEMS(months),
                       sizeof(months[0]), compmi);
         if (res == NULL)
             printf("\[aq]%s\[aq]: unknown month\[rs]n", argv[i]);

diff --git a/man/man3/fread.3 b/man/man3/fread.3
index 1b6c77a665c86dcce68aab2cbd57caffbec34058..63108c765d97f4daa50a40e03809024c8c803945 100644 (file)
--- a/man/man3/fread.3
+++ b/man/man3/fread.3
@@ -108,7 +108,7 @@ Class: 0x02
 #include <stdio.h>
 #include <stdlib.h>
 \&
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof(arr) / sizeof((arr)[0]))
 \&
 int
 main(void)
@@ -123,8 +123,8 @@ main(void)
         return EXIT_FAILURE;
     }
 \&
-    ret = fread(buffer, sizeof(*buffer), ARRAY_SIZE(buffer), fp);
-    if (ret != ARRAY_SIZE(buffer)) {
+    ret = fread(buffer, sizeof(*buffer), NITEMS(buffer), fp);
+    if (ret != NITEMS(buffer)) {
         fprintf(stderr, "fread() failed: %zu\[rs]n", ret);
         exit(EXIT_FAILURE);
     }

diff --git a/man/man3/regex.3 b/man/man3/regex.3
index 21e9c4c0b713a63df3cc56ceb87a448a5f2539a1..3424580bd61d64f20c1c483cd1d449daa1746980 100644 (file)
--- a/man/man3/regex.3
+++ b/man/man3/regex.3
@@ -360,7 +360,7 @@ Always reference them by name.
 #include <stdlib.h>
 #include <regex.h>
 \&
-#define ARRAY_SIZE(arr) (sizeof((arr)) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof((arr)) / sizeof((arr)[0]))
 \&
 static const char *const str =
         "1) John Driverhacker;\[rs]n2) John Doe;\[rs]n3) John Foo;\[rs]n";
@@ -380,7 +380,7 @@ int main(void)
     printf("Matches:\[rs]n");
 \&
     for (unsigned int i = 0; ; i++) {
-        if (regexec(&regex, s, ARRAY_SIZE(pmatch), pmatch, 0))
+        if (regexec(&regex, s, NITEMS(pmatch), pmatch, 0))
             break;
 \&
         off = pmatch[0].rm_so + (s \- str);

diff --git a/man/man3/static_assert.3 b/man/man3/static_assert.3
index 410607bd0cf561ddc6d49092d6e7ab57b4e7988c..e079e6bbd2c1277dc45ac3c46036ee78fd72a3d7 100644 (file)
--- a/man/man3/static_assert.3
+++ b/man/man3/static_assert.3
@@ -90,7 +90,7 @@ The following program uses the macro to get the size of an array safely.
 #define must_be_array(arr)  must_be(is_array(arr))
 \&
 #define sizeof_array(arr)   (sizeof(arr) + must_be_array(arr))
-#define nitems(arr)         (sizeof((arr)) / sizeof((arr)[0]) \[rs]
+#define NITEMS(arr)         (sizeof((arr)) / sizeof((arr)[0]) \[rs]
                              + must_be_array(arr))
 \&
 int     foo[10];
@@ -99,13 +99,13 @@ int8_t  bar[sizeof_array(foo)];
 int
 main(void)
 {
-    for (size_t i = 0; i < nitems(foo); i++) {
+    for (size_t i = 0; i < NITEMS(foo); i++) {
         foo[i] = i;
     }
 \&
     memcpy(bar, foo, sizeof_array(bar));
 \&
-    for (size_t i = 0; i < nitems(bar); i++) {
+    for (size_t i = 0; i < NITEMS(bar); i++) {
         printf("%d,", bar[i]);
     }
 \&

diff --git a/man/man3/strncat.3 b/man/man3/strncat.3
index 13ea833345bdca48d061a5801cb23feec48e9964..25111caca4f3bd0df9f157d0f058161652b95111 100644 (file)
--- a/man/man3/strncat.3
+++ b/man/man3/strncat.3
@@ -95,7 +95,7 @@ Shlemiel the painter
 #include <stdlib.h>
 #include <string.h>
 \&
-#define nitems(arr)  (sizeof((arr)) / sizeof((arr)[0]))
+#define NITEMS(arr)  (sizeof((arr)) / sizeof((arr)[0]))
 \&
 int
 main(void)
@@ -111,15 +111,15 @@ main(void)
     char    src[] = "some_long_body.post";
     char    *dest;
 \&
-    n = nitems(pre) + strlen(src) \- strlen(post) + nitems(new_post) + 1;
+    n = NITEMS(pre) + strlen(src) \- strlen(post) + NITEMS(new_post) + 1;
     dest = malloc(sizeof(*dest) * n);
     if (dest == NULL)
         err(EXIT_FAILURE, "malloc()");
 \&
     dest[0] = \[aq]\[rs]0\[aq];  // There's no 'cpy' function to this 'cat'.
-    strncat(dest, pre, nitems(pre));
+    strncat(dest, pre, NITEMS(pre));
     strncat(dest, src, strlen(src) \- strlen(post));
-    strncat(dest, new_post, nitems(new_post));
+    strncat(dest, new_post, NITEMS(new_post));
 \&
     puts(dest);  // "pre.some_long_body.foo.bar"
     free(dest);