From 2e0145fb95bbe2b379412f661494c3954b1c21a1 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sun, 4 Dec 2011 05:23:43 +0800
Subject: [PATCH] - We don't need to test for NULL before free()

---
 dbutil.c | 6 ------
 dbutil.h | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/dbutil.c b/dbutil.c
index 8823ab6..5460799 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -800,12 +800,6 @@ void * m_strdup(const char * str) {
 	return ret;
 }
 
-void __m_free(void* ptr) {
-	if (ptr != NULL) {
-		free(ptr);
-	}
-}
-
 void * m_realloc(void* ptr, size_t size) {
 
 	void *ret;
diff --git a/dbutil.h b/dbutil.h
index 14c4c28..0f16bf3 100644
--- a/dbutil.h
+++ b/dbutil.h
@@ -83,8 +83,7 @@ void m_close(int fd);
 void * m_malloc(size_t size);
 void * m_strdup(const char * str);
 void * m_realloc(void* ptr, size_t size);
-#define m_free(X) __m_free(X); (X) = NULL;
-void __m_free(void* ptr);
+#define m_free(X) free(X); (X) = NULL;
 void m_burn(void* data, unsigned int len);
 void setnonblocking(int fd);
 void disallow_core();