summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2011-12-04 05:23:43 +0800
committerMatt Johnston <matt@ucc.asn.au>2011-12-04 05:23:43 +0800
commit87e405f6fd5b8036d7a5ff9caa7fd7240036b4c0 (patch)
tree4ee68065e74d16baa9b5b0a77b325cff8202eefb
parent2c9af172851809b463ec9f88917274d83543eeac (diff)
downloaddropbear-87e405f6fd5b8036d7a5ff9caa7fd7240036b4c0.tar.gz
- We don't need to test for NULL before free()
-rw-r--r--dbutil.c6
-rw-r--r--dbutil.h3
2 files changed, 1 insertions, 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();