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

do not check for NULL in FREE macro
2017-11-29 08:33:27 +01:00
parent 3e34122de4 865bd462b4
commit f6f198c3fe
5 changed files with 20 additions and 30 deletions
--- 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)          \
-    do {                 \
-        if (p != NULL) { \
-            free(p);     \
-            p = NULL;    \
-        }                \
+#define FREE(p)   \
+    do {          \
+        free(p);  \
+        p = NULL; \
    } while (0)

 /* Securely free single-linked list */