public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/bz23960-dirent] support: Add xreallocarray
@ 2023-12-29 19:59 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-12-29 19:59 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5c2728e451fa15b97b5161ffd20cf647b54f39e6
commit 5c2728e451fa15b97b5161ffd20cf647b54f39e6
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 1 14:41:23 2023 -0300
support: Add xreallocarray
As a wrapper over reallocarray.
Diff:
---
support/Makefile | 1 +
support/support.h | 2 ++
support/xreallocarray.c | 29 +++++++++++++++++++++++++++++
3 files changed, 32 insertions(+)
diff --git a/support/Makefile b/support/Makefile
index 9aa7f23a6e..25233bcf8f 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -201,6 +201,7 @@ libsupport-routines = \
xread \
xreadlink \
xrealloc \
+ xreallocarray \
xrecvfrom \
xsendto \
xsetlocale \
diff --git a/support/support.h b/support/support.h
index 4a068d3aee..31cea1df17 100644
--- a/support/support.h
+++ b/support/support.h
@@ -107,6 +107,8 @@ extern void *xcalloc (size_t n, size_t s)
__returns_nonnull;
extern void *xrealloc (void *o, size_t n)
__attribute_malloc__ __attribute_alloc_size__ ((2)) __attr_dealloc_free;
+extern void *xreallocarray (void *p, size_t n, size_t s)
+ __attribute_alloc_size__ ((2, 3)) __attr_dealloc_free;
extern char *xstrdup (const char *) __attribute_malloc__ __attr_dealloc_free
__returns_nonnull;
void *xposix_memalign (size_t alignment, size_t n)
diff --git a/support/xreallocarray.c b/support/xreallocarray.c
new file mode 100644
index 0000000000..74fdaa421b
--- /dev/null
+++ b/support/xreallocarray.c
@@ -0,0 +1,29 @@
+/* Error-checking wrapper for reallocarray
+ Copyright (C) 2016-2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdlib.h>
+#include <support/support.h>
+
+void *
+xreallocarray (void *p, size_t n, size_t s)
+{
+ void *r = reallocarray (p, n, s);
+ if (r == NULL && (p == NULL || (n != 0 && s != 0)))
+ oom_error ("reallocarray", n);
+ return r;
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-12-29 19:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 19:59 [glibc/azanella/bz23960-dirent] support: Add xreallocarray Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).