From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 28 Feb 2025 15:15:56 +0000 (+0900)
Subject: alloc-util: reallocarray() exists since glibc-2.26
X-Git-Tag: v258-rc1~1195^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e79d88320a60def6607296a558b3fa2fbf5ed84d;p=thirdparty%2Fsystemd.git

alloc-util: reallocarray() exists since glibc-2.26
---

diff --git a/meson.build b/meson.build
index 108e3d46b05..7cf12bc452e 100644
--- a/meson.build
+++ b/meson.build
@@ -615,7 +615,6 @@ foreach ident : [
                                  #include <keyutils.h>'''],
         ['bpf',               '''#include <sys/syscall.h>
                                  #include <unistd.h>'''],
-        ['reallocarray',      '''#include <stdlib.h>'''],
         ['set_mempolicy',     '''#include <stdlib.h>
                                  #include <unistd.h>'''],
         ['get_mempolicy',     '''#include <stdlib.h>
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index ba71298287a..e589a94fd09 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -119,15 +119,6 @@ _malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t need, size_t s
         return malloc(size * need ?: 1);
 }
 
-#if !HAVE_REALLOCARRAY
-_alloc_(2, 3) static inline void *reallocarray(void *p, size_t need, size_t size) {
-        if (size_multiply_overflow(size, need))
-                return NULL;
-
-        return realloc(p, size * need ?: 1);
-}
-#endif
-
 _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t need, size_t size) {
         if (size_multiply_overflow(size, need))
                 return NULL;