Merge pull request #3058 from d-e-s-o/fix-FREE

do not check for NULL in FREE macro
i3 · Nov 29, 2017 · f6f198c · f6f198c
2 parents 3e34122 + 865bd46
commit f6f198c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
@@ -58,12 +58,10 @@
 #error "SYSCONFDIR not defined"
 #endif
 
-#define FREE(pointer)          \
+#define FREE(pointer)   \
-    do {                       \
+    do {                \
-        if (pointer != NULL) { \
+        free(pointer);  \
-            free(pointer);     \
+        pointer = NULL; \
-            pointer = NULL;    \
-        }                      \
     } while (0)
 
 #include "xcb.h"

diff --git a/i3-input/i3-input.h b/i3-input/i3-input.h
@@ -5,12 +5,10 @@
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
-#define FREE(pointer)          \
+#define FREE(pointer)   \
-    do {                       \
+    do {                \
-        if (pointer != NULL) { \
+        free(pointer);  \
-            free(pointer);     \
+        pointer = NULL; \
-            pointer = NULL;    \
-        }                      \
     } while (0)
 
 extern xcb_window_t root;
diff --git a/i3-nagbar/i3-nagbar.h b/i3-nagbar/i3-nagbar.h
@@ -5,12 +5,10 @@
 #include <err.h>
 
 #define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
-#define FREE(pointer)          \
+#define FREE(pointer)   \
-    do {                       \
+    do {                \
-        if (pointer != NULL) { \
+        free(pointer);  \
-            free(pointer);     \
+        pointer = NULL; \
-            pointer = NULL;    \
-        }                      \
     } while (0)
 
 #define xmacro(atom) xcb_atom_t A_##atom;

diff --git a/i3bar/include/util.h b/i3bar/include/util.h
@@ -20,12 +20,10 @@
 #define STARTS_WITH(string, len, needle) (((len) >= strlen((needle))) && strncasecmp((string), (needle), strlen((needle))) == 0)
 
 /* Securely free p */
-#define FREE(p)          \
+#define FREE(p)   \
-    do {                 \
+    do {          \
-        if (p != NULL) { \
+        free(p);  \
-            free(p);     \
+        p = NULL; \
-            p = NULL;    \
-        }                \
     } while (0)
 
 /* Securely free single-linked list */

diff --git a/include/util.h b/include/util.h
@@ -47,12 +47,10 @@
         break;                            \
     }
 
-#define FREE(pointer)          \
+#define FREE(pointer)   \
-    do {                       \
+    do {                \
-        if (pointer != NULL) { \
+        free(pointer);  \
-            free(pointer);     \
+        pointer = NULL; \
-            pointer = NULL;    \
-        }                      \
     } while (0)
 
 #define CALL(obj, member, ...) obj->member(obj, ##__VA_ARGS__)