From c416fe0da43f9caffd8b5f6c1a627c8f7a16f881 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 28 Nov 2019 09:51:58 +0000 Subject: [PATCH] Add xrecallocarray. --- xmalloc.c | 14 ++++++++++++++ xmalloc.h | 1 + 2 files changed, 15 insertions(+) diff --git a/xmalloc.c b/xmalloc.c index f249e397..d11d8dc7 100644 --- a/xmalloc.c +++ b/xmalloc.c @@ -71,6 +71,20 @@ xreallocarray(void *ptr, size_t nmemb, size_t size) return new_ptr; } +void * +xrecallocarray(void *ptr, size_t oldnmemb, size_t nmemb, size_t size) +{ + void *new_ptr; + + if (nmemb == 0 || size == 0) + fatalx("xrecallocarray: zero size"); + new_ptr = recallocarray(ptr, oldnmemb, nmemb, size); + if (new_ptr == NULL) + fatalx("xrecallocarray: allocating %zu * %zu bytes: %s", + nmemb, size, strerror(errno)); + return new_ptr; +} + char * xstrdup(const char *str) { diff --git a/xmalloc.h b/xmalloc.h index a3ee486f..3fe4f1cc 100644 --- a/xmalloc.h +++ b/xmalloc.h @@ -23,6 +23,7 @@ void *xmalloc(size_t); void *xcalloc(size_t, size_t); void *xrealloc(void *, size_t); void *xreallocarray(void *, size_t, size_t); +void *xrecallocarray(void *, size_t, size_t, size_t); char *xstrdup(const char *); char *xstrndup(const char *, size_t); int xasprintf(char **, const char *, ...)