From 02f39006a3c50ee48f9fb2a880e3e1ea625ca70b Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Sun, 13 May 2001 05:15:47 +0000
Subject: [PATCH] add type-specific allocators

---
 src/libFLAC/include/private/memory.h |  8 +++-
 src/libFLAC/memory.c                 | 91 +++++++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/libFLAC/include/private/memory.h b/src/libFLAC/include/private/memory.h
index 6f300e2..142f5be 100644
--- a/src/libFLAC/include/private/memory.h
+++ b/src/libFLAC/include/private/memory.h
@@ -22,9 +22,15 @@
 
 #include <stdlib.h> /* for size_t */
 
+#include "FLAC/ordinals.h" /* for bool */
+
 /* Returns the unaligned address returned by malloc.
  * Use free() on this address to deallocate.
  */
-void *FLAC__memory_alloc(size_t bytes, void **aligned_address);
+void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address);
+bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, int32 **unaligned_pointer, int32 **aligned_pointer);
+bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, uint32 **unaligned_pointer, uint32 **aligned_pointer);
+bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
+bool FLAC__memory_alloc_aligned_real_array(unsigned elements, real **unaligned_pointer, real **aligned_pointer);
 
 #endif
diff --git a/src/libFLAC/memory.c b/src/libFLAC/memory.c
index 6e7f963..4c1640e 100644
--- a/src/libFLAC/memory.c
+++ b/src/libFLAC/memory.c
@@ -18,9 +18,10 @@
  */
 
 #include <assert.h>
+#include <stdio.h> /*@@@ for stderr */
 #include "private/memory.h"
 
-void *FLAC__memory_alloc(size_t bytes, void **aligned_address)
+void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
 {
 	void *x;
 
@@ -37,3 +38,91 @@ fprintf(stderr, "FLAC__memory_alloc(unaligned=%p, aligned=%p)\n",x,*aligned_addr
 #endif
 	return x;
 }
+
+bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, int32 **unaligned_pointer, int32 **aligned_pointer)
+{
+	int32 *pa, *pu; /* aligned pointer, unaligned pointer */
+
+	assert(elements > 0);
+	assert(0 != unaligned_pointer);
+	assert(0 != aligned_pointer);
+	assert(unaligned_pointer != aligned_pointer);
+
+	pu = (int32*)FLAC__memory_alloc_aligned(sizeof(int32) * elements, (void*)&pa);
+	if(0 == pu) {
+		return false;
+	}
+	else {
+		if(*unaligned_pointer != 0)
+			free(*unaligned_pointer);
+		*unaligned_pointer = pu;
+		*aligned_pointer = pa;
+		return true;
+	}
+}
+
+bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, uint32 **unaligned_pointer, uint32 **aligned_pointer)
+{
+	uint32 *pa, *pu; /* aligned pointer, unaligned pointer */
+
+	assert(elements > 0);
+	assert(0 != unaligned_pointer);
+	assert(0 != aligned_pointer);
+	assert(unaligned_pointer != aligned_pointer);
+
+	pu = (uint32*)FLAC__memory_alloc_aligned(sizeof(uint32) * elements, (void*)&pa);
+	if(0 == pu) {
+		return false;
+	}
+	else {
+		if(*unaligned_pointer != 0)
+			free(*unaligned_pointer);
+		*unaligned_pointer = pu;
+		*aligned_pointer = pa;
+		return true;
+	}
+}
+
+bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
+{
+	unsigned *pa, *pu; /* aligned pointer, unaligned pointer */
+
+	assert(elements > 0);
+	assert(0 != unaligned_pointer);
+	assert(0 != aligned_pointer);
+	assert(unaligned_pointer != aligned_pointer);
+
+	pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, (void*)&pa);
+	if(0 == pu) {
+		return false;
+	}
+	else {
+		if(*unaligned_pointer != 0)
+			free(*unaligned_pointer);
+		*unaligned_pointer = pu;
+		*aligned_pointer = pa;
+		return true;
+	}
+}
+
+bool FLAC__memory_alloc_aligned_real_array(unsigned elements, real **unaligned_pointer, real **aligned_pointer)
+{
+	real *pa, *pu; /* aligned pointer, unaligned pointer */
+
+	assert(elements > 0);
+	assert(0 != unaligned_pointer);
+	assert(0 != aligned_pointer);
+	assert(unaligned_pointer != aligned_pointer);
+
+	pu = (real*)FLAC__memory_alloc_aligned(sizeof(real) * elements, (void*)&pa);
+	if(0 == pu) {
+		return false;
+	}
+	else {
+		if(*unaligned_pointer != 0)
+			free(*unaligned_pointer);
+		*unaligned_pointer = pu;
+		*aligned_pointer = pa;
+		return true;
+	}
+}
-- 
2.7.4