lib/util: Move calloc_array and memalign_array to top-level libutil.

2 files changed, 0 insertions, 34 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e8a0d42b3c..a4fb496ea9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -489,8 +489,6 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
 			   struct event_context *ev_ctx,
 			   bool parent_longlived);
 void *malloc_(size_t size);
-void *memalign_array(size_t el_size, size_t align, unsigned int count);
-void *calloc_array(size_t size, size_t nmemb);
 void *Realloc(void *p, size_t size, bool free_old_on_error);
 void add_to_large_array(TALLOC_CTX *mem_ctx, size_t element_size,
 			void *element, void *_array, uint32 *num_elements,
diff --git a/source3/lib/util_malloc.c b/source3/lib/util_malloc.c
index d773d8ffd6..b2ef49d81e 100644
--- a/source3/lib/util_malloc.c
+++ b/source3/lib/util_malloc.c
@@ -70,38 +70,6 @@ static void *realloc_(void *ptr, size_t size)
 #endif /* PARANOID_MALLOC_CHECKER */
 
 /****************************************************************************
- Type-safe memalign
-****************************************************************************/
-
-void *memalign_array(size_t el_size, size_t align, unsigned int count)
-{
-	if (count >= MAX_ALLOC_SIZE/el_size) {
-		return NULL;
-	}
-
-	return memalign(align, el_size*count);
-}
-
-/****************************************************************************
- Type-safe calloc.
-****************************************************************************/
-
-void *calloc_array(size_t size, size_t nmemb)
-{
-	if (nmemb >= MAX_ALLOC_SIZE/size) {
-		return NULL;
-	}
-	if (size == 0 || nmemb == 0) {
-		return NULL;
-	}
-#if defined(PARANOID_MALLOC_CHECKER)
-	return calloc_(nmemb, size);
-#else
-	return calloc(nmemb, size);
-#endif
-}
-
-/****************************************************************************
  Expand a pointer to be a particular size.
  Note that this version of Realloc has an extra parameter that decides
  whether to free the passed in storage on allocation failure or if the