- replaced long macros with functions

2 files changed, 43 insertions, 21 deletions

diff --git a/Source/charon/allocator.c b/Source/charon/allocator.c
index 0a4f45937..c144911fd 100644
--- a/Source/charon/allocator.c
+++ b/Source/charon/allocator.c
@@ -175,7 +175,7 @@ static chunk_t allocate_as_chunk(allocator_t *allocator,size_t bytes, char * fil
 }
 
 /*
- * Implements allocator_t's free_pointer allocate. 
+ * Implements allocator_t's free_pointer function. 
  * See #allocator_s.free_pointer for description.
  */
 static void free_pointer(allocator_t *allocator, void * pointer)
@@ -210,7 +210,7 @@ static void free_pointer(allocator_t *allocator, void * pointer)
 }
 
 /*
- * Implements allocator_t's reallocate allocate. 
+ * Implements allocator_t's reallocate function. 
  * See #allocator_s.reallocate for description.
  */
 static void * reallocate(allocator_t *allocator, void * old, size_t bytes, char * file,int line)
@@ -244,6 +244,10 @@ static void * reallocate(allocator_t *allocator, void * old, size_t bytes, char
 	return new_space;
 }
 
+/*
+ * Implements allocator_t's clone_bytes function. 
+ * See #allocator_s.clone_bytes for description.
+ */
 static void * clone_bytes(allocator_t *allocator,void * to_clone, size_t bytes, char * file, int line)
 {
 	private_allocator_t *this = (private_allocator_t *) allocator;
@@ -252,6 +256,7 @@ static void * clone_bytes(allocator_t *allocator,void * to_clone, size_t bytes,
     {
 	    	return NULL;
     }
+
     
 	void *new_space = this->allocate_special(this,bytes,file,line,TRUE);
 
@@ -313,7 +318,35 @@ static private_allocator_t allocator = {
 	mutex: PTHREAD_MUTEX_INITIALIZER
 };
 
+allocator_t *global_allocator = &(allocator.public);
+#else /* !LEAK_DETECTION */
+
+
+chunk_t allocator_alloc_as_chunk(size_t bytes)
+{
+	chunk_t new_chunk;
+	new_chunk.ptr = malloc(bytes); 
+	new_chunk.len = (new_chunk.ptr == NULL) ? 0 : bytes; 
+	return new_chunk; 
+
+}
+
+void * allocator_clone_bytes(void * pointer, size_t size)
+{
+	void *data;
+	data = malloc(size);
+	if (data == NULL){ return NULL;}
+	memcpy(data,pointer,size);
+	return (data);
+}
+
+
+void allocator_free_chunk(chunk_t chunk)
+{
+	free(chunk.ptr);		
+}
+
+
+#endif /* LEAK_DETECTION */
 
 
-allocator_t *global_allocator = &(allocator.public);
-#endif
diff --git a/Source/charon/allocator.h b/Source/charon/allocator.h
index fdc2b1f9e..e0611b843 100644
--- a/Source/charon/allocator.h
+++ b/Source/charon/allocator.h
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <stddef.h>
+#include <string.h>
 
 #include "types.h"
 
@@ -210,25 +211,13 @@
 	#define report_memory_leaks(void) (global_allocator->report_memory_leaks(global_allocator))
 #else
 	#define allocator_alloc(bytes) (malloc(bytes))
-	#define allocator_alloc_as_chunk(bytes){\
-		chunk_t new_chunk; \
-		new_chunk.ptr = malloc(bytes); \
-		new_chunk.len = (new_chunk.ptr == NULL) ? 0 : bytes; \
-		return new_chunk; \
-	}
+	
+	chunk_t allocator_alloc_as_chunk(size_t bytes);
+	
 	#define allocator_realloc(old,bytes) (realloc(old,bytes))
 	#define allocator_free(pointer) (free(pointer))
-	#define allocator_clone_bytes(pointer,size){\
-		void *new_data = malloc(size)\
-		if (new_data == NULL) return NULL; \
-		memcpy(new_data,pointer,size)\
-		return new_data; \
-	}
-	#define allocator_free_chunk(chunk){	\
-		free(chunk.ptr);					\
-		chunk.ptr = NULL;				\
-		chunk.len = 0;					\
-	}
+	void * allocator_clone_bytes(void * pointer, size_t size);
+	void allocator_free_chunk(chunk_t chunk);
 	#define report_memory_leaks(void) {}
 #endif