Unite all nitems copies in ld.so/util.h

OK deraadt

diff --git a/libexec/ld.so/aarch64/rtld_machine.c b/libexec/ld.so/aarch64/rtld_machine.c
index 9411f32..f8d8d0e 100644 (file)
--- a/libexec/ld.so/aarch64/rtld_machine.c
+++ b/libexec/ld.so/aarch64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtld_machine.c,v 1.21 2022/01/08 06:49:41 guenther Exp $ */
+/*     $OpenBSD: rtld_machine.c,v 1.22 2023/01/29 20:30:21 gnezdo Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -93,8 +93,6 @@ static const Elf_Addr reloc_target_bitmask[] = {
 
 void _dl_reloc_plt(Elf_Word *where, Elf_Addr value, Elf_RelA *rel);
 
-#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
-
 int
 _dl_md_reloc(elf_object_t *object, int rel, int relsz)
 {

diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c
index d2bf67c..ba9eb94 100644 (file)
--- a/libexec/ld.so/amd64/rtld_machine.c
+++ b/libexec/ld.so/amd64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtld_machine.c,v 1.41 2022/05/01 11:03:48 kettenis Exp $ */
+/*     $OpenBSD: rtld_machine.c,v 1.42 2023/01/29 20:30:21 gnezdo Exp $ */
 
 /*
  * Copyright (c) 2002,2004 Dale Rahn
@@ -75,8 +75,6 @@
 #include "util.h"
 #include "resolve.h"
 
-#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
-
 int64_t pcookie __attribute__((section(".openbsd.randomdata"))) __dso_hidden;
 
 /*

diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c
index 254d5c4..4831523 100644 (file)
--- a/libexec/ld.so/i386/rtld_machine.c
+++ b/libexec/ld.so/i386/rtld_machine.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtld_machine.c,v 1.50 2022/05/10 20:23:57 kettenis Exp $ */
+/*     $OpenBSD: rtld_machine.c,v 1.51 2023/01/29 20:30:21 gnezdo Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -75,8 +75,6 @@
 #include "util.h"
 #include "resolve.h"
 
-#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
-
 int64_t pcookie __attribute__((section(".openbsd.randomdata"))) __dso_hidden;
 
 /*

diff --git a/libexec/ld.so/riscv64/rtld_machine.c b/libexec/ld.so/riscv64/rtld_machine.c
index 82a47cc..14989be 100644 (file)
--- a/libexec/ld.so/riscv64/rtld_machine.c
+++ b/libexec/ld.so/riscv64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtld_machine.c,v 1.3 2022/01/08 06:49:42 guenther Exp $ */
+/*     $OpenBSD: rtld_machine.c,v 1.4 2023/01/29 20:30:21 gnezdo Exp $ */
 
 /*
  * Copyright (c) 2004,2021 Dale Rahn <drahn@openbsd.org>
@@ -92,8 +92,6 @@ static const Elf_Addr reloc_target_bitmask[] = {
 
 void _dl_reloc_plt(Elf_Word *where, Elf_Addr value, Elf_RelA *rel);
 
-#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
-
 int
 _dl_md_reloc(elf_object_t *object, int rel, int relsz)
 {

diff --git a/libexec/ld.so/sh/rtld_machine.c b/libexec/ld.so/sh/rtld_machine.c
index f3c59a3..40746fa 100644 (file)
--- a/libexec/ld.so/sh/rtld_machine.c
+++ b/libexec/ld.so/sh/rtld_machine.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rtld_machine.c,v 1.35 2022/09/05 20:09:24 miod Exp $ */
+/*     $OpenBSD: rtld_machine.c,v 1.36 2023/01/29 20:30:21 gnezdo Exp $ */
 
 /*
  * Copyright (c) 2004 Dale Rahn
@@ -39,8 +39,6 @@
 #include "util.h"
 #include "resolve.h"
 
-#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
-
 int64_t pcookie __attribute__((section(".openbsd.randomdata"))) __dso_hidden;
 
 void _dl_bind_start(void); /* XXX */

diff --git a/libexec/ld.so/util.h b/libexec/ld.so/util.h
index e4e749a..d2f47ba 100644 (file)
--- a/libexec/ld.so/util.h
+++ b/libexec/ld.so/util.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: util.h,v 1.37 2022/01/08 06:49:41 guenther Exp $      */
+/*     $OpenBSD: util.h,v 1.38 2023/01/29 20:30:21 gnezdo Exp $        */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <millert@openbsd.org>
@@ -77,6 +77,8 @@ __END_HIDDEN_DECLS
 #define        _dl_round_page(x) \
        (((x) + ((1 << _MAX_PAGE_SHIFT) - 1)) & ~((1 << _MAX_PAGE_SHIFT) - 1))
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 /*
  *     The following functions are declared inline so they can
  *     be used before bootstrap linking has been finished.