From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 30 Mar 2021 11:39:46 +0000 (+0200)
Subject: _gnutls_calloc: remove unused function
X-Git-Tag: 3.7.2~31^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=043d1bc387238139a4c2b7f7a6fffdac97ab2b73;p=thirdparty%2Fgnutls.git

_gnutls_calloc: remove unused function

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/lib/mem.c b/lib/mem.c
index 9a74456dbb..c6a78b1edd 100644
--- a/lib/mem.c
+++ b/lib/mem.c
@@ -23,7 +23,6 @@
 #include "gnutls_int.h"
 #include "errors.h"
 #include <num.h>
-#include <xsize.h>
 #include "xalloc-oversized.h"
 
 gnutls_alloc_function gnutls_secure_malloc = malloc;
@@ -34,16 +33,6 @@ gnutls_realloc_function gnutls_realloc = realloc;
 void *(*gnutls_calloc) (size_t, size_t) = calloc;
 char *(*gnutls_strdup) (const char *) = _gnutls_strdup;
 
-void *_gnutls_calloc(size_t nmemb, size_t size)
-{
-	void *ret;
-	size_t n = xtimes(nmemb, size);
-	ret = (size_in_bounds_p(n) ? gnutls_malloc(n) : NULL);
-	if (ret != NULL)
-		memset(ret, 0, size);
-	return ret;
-}
-
 /* This realloc will free ptr in case realloc
  * fails.
  */
diff --git a/lib/mem.h b/lib/mem.h
index 13f47f17b4..10a8db742d 100644
--- a/lib/mem.h
+++ b/lib/mem.h
@@ -31,7 +31,6 @@
 void *gnutls_realloc_fast(void *ptr, size_t size);
 void *_gnutls_reallocarray_fast(void *ptr, size_t nmemb, size_t size);
 
-void *_gnutls_calloc(size_t nmemb, size_t size);
 char *_gnutls_strdup(const char *);
 
 void *_gnutls_reallocarray(void *, size_t, size_t);