From b9f88cf05c5634f5fada40acc476225c88a845f0 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Tue, 20 Aug 2013 13:19:31 +0100
Subject: [PATCH] to test it use Best Fit memory management in logger.

---
 src/logger/interface/i_logger.c | 18 ++++++++++--------
 tests/Makefile.am               |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/logger/interface/i_logger.c b/src/logger/interface/i_logger.c
index 1ab7c2d..188ec78 100644
--- a/src/logger/interface/i_logger.c
+++ b/src/logger/interface/i_logger.c
@@ -27,6 +27,8 @@
 #include "logger/logger.h"
 #include "logger/interface/logger.h"
 
+#include "utils/memory.h"
+
 const struct interface i_Logger = {
 	"logger",
 	1
@@ -37,23 +39,23 @@ loggerLog(void * _object, logger_level level, const char * const fmt, ...) {
 	Logger object = _object;
 
 	if (level >= object->min_level) {
-		char *  msg      = NULL;
-		size_t  msg_size = 0;
-		va_list params;
+		struct memSegment * msg      = NULL;
+		size_t              msg_size = 0;
+		va_list             params;
 
 		va_start(params, fmt);
-		msg_size = vsnprintf(msg, msg_size, fmt, params);
+		msg_size = vsnprintf(NULL, msg_size, fmt, params);
 		va_end(params);
 
-		msg = malloc(msg_size + 1);
+		msg = memMalloc(msg_size + 1);
 
 		va_start(params, fmt);
-		vsnprintf(msg, msg_size + 1, fmt, params);
+		vsnprintf(msg->ptr, msg_size + 1, fmt, params);
 		va_end(params);
 
-		CALL(_object, Logger, log, level, msg);
+		CALL(_object, Logger, log, level, msg->ptr);
 
-		free(msg);
+		MEM_FREE(msg);
 	}
 }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7f4a3e3..5902f03 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ LOGGER = $(CLASS) \
 	 ../src/logger/stderr.c \
 	 ../src/logger/syslog.c \
 	 ../src/logger/interface/i_logger.c \
+	 ../src/utils/memory.c \
 	 mock/mock_logger.c
 
 SOCKET = $(LOGGER) \
@@ -38,7 +39,6 @@ SERVER = $(SOCKET) \
 	 ../src/server/read.c \
 	 ../src/server/write.c \
 	 ../src/utils/signalHandling.c \
-	 ../src/utils/memory.c \
 	 mock/mock_worker.c
 
 classTest_SOURCES = $(CLASS) classTest.c
@@ -55,7 +55,7 @@ socketTest_LDFLAGS = -lgcov -pg
 
 serverTest_SOURCES = $(SERVER) serverTest.c
 serverTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -pg -I ../include -I .. -I .
-serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -pg
+serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov -lcrypto -pg
 
 EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h