From e4e256c4c2b4d346829ced1bb2c09cf77b0c3d04 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Fri, 18 Mar 2016 21:57:29 +1000
Subject: [PATCH] * remove FREE() macro

---
 src/common.h   | 2 --
 src/config.c   | 3 ++-
 src/filelist.c | 2 +-
 src/ipaddr.c   | 2 +-
 src/jail.c     | 2 +-
 src/matches.c  | 3 ++-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common.h b/src/common.h
index 9594471..318df55 100644
--- a/src/common.h
+++ b/src/common.h
@@ -28,6 +28,4 @@
 
 #define UNUSED(x)  (void)(x)
 
-#define FREE(x)   free(x), x = NULL
-
 #endif /* F2B_COMMON_H_ */
diff --git a/src/config.c b/src/config.c
index dde949f..b3a521c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -277,7 +277,8 @@ f2b_config_load(f2b_config_t *config, const char *path, bool recursion) {
     for (; SECTION->param != NULL; \
            SECTION->param = np) { \
       np = SECTION->param->next; \
-      FREE(SECTION->param); \
+      free(SECTION->param);  \
+      SECTION->param = NULL; \
     } \
   }
 
diff --git a/src/filelist.c b/src/filelist.c
index bbc1158..50d01bc 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -36,7 +36,7 @@ f2b_filelist_from_glob(const char *pattern) {
       continue;
     if (f2b_logfile_open(file, globbuf.gl_pathv[i]) == false) {
       f2b_log_msg(log_error, "can't open file: %s: %s", globbuf.gl_pathv[i], strerror(errno));
-      FREE(file);
+      free(file);
       continue;
     }
     files = f2b_filelist_append(files, file);
diff --git a/src/ipaddr.c b/src/ipaddr.c
index d40964e..5d41a30 100644
--- a/src/ipaddr.c
+++ b/src/ipaddr.c
@@ -32,7 +32,7 @@ f2b_ipaddr_create(const char *addr, size_t matches) {
   return a;
 
   cleanup:
-  FREE(a);
+  free(a);
   return NULL;
 }
 
diff --git a/src/jail.c b/src/jail.c
index 7d2bb02..1d07586 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -266,7 +266,7 @@ f2b_jail_init(f2b_jail_t *jail, f2b_config_t *config) {
     f2b_log_msg(log_error, "jail '%s': 'source' supports only 'files' for now", jail->name);
     return false;
   }
-  if (jail->source_init == '\0') {
+  if (jail->source_init[0] == '\0') {
     f2b_log_msg(log_error, "jail '%s': 'source' requires file or files pattern", jail->name);
     return false;
   }
diff --git a/src/matches.c b/src/matches.c
index f8c9000..3e74cbe 100644
--- a/src/matches.c
+++ b/src/matches.c
@@ -24,7 +24,8 @@ void
 f2b_matches_destroy(f2b_matches_t *m) {
   assert(m != NULL);
 
-  FREE(m->times);
+  free(m->times);
+  m->times = NULL;
   m->used = 0;
   m->max  = 0;
 }