Reduce some code around frees

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index 0c8c705a784024429238ff98055f1f945d20d642..988654d293b661f64ecb00bf77ebb97514d86550 100644 (file)
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -216,7 +216,7 @@ static const char *get_string(const char *identifier) {
 
 static void clear_stack(void) {
     for (int c = 0; c < 10; c++) {
-        if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
+        if (stack[c].type == STACK_STR)
             free(stack[c].val.str);
         stack[c].identifier = NULL;
         stack[c].val.str = NULL;

diff --git a/libi3/dpi.c b/libi3/dpi.c
index a2c40319a52b492fcd57b6168495cc5d127257af..9bb32b68db940d058bbd4bc0efedca8c66cfa84c 100644 (file)
--- a/libi3/dpi.c
+++ b/libi3/dpi.c
@@ -54,9 +54,7 @@ void init_dpi(void) {
     DLOG("Found Xft.dpi = %ld.\n", dpi);
 
 init_dpi_end:
-    if (resource != NULL) {
-        free(resource);
-    }
+    free(resource);
 
     if (database != NULL) {
         xcb_xrm_database_free(database);

diff --git a/libi3/font.c b/libi3/font.c
index 3dca8124bbce32c7cdd97738244ec7af4e3c5fa7..7be84ee07775474a1efe9b18aafaa44e04475b15 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -224,9 +224,7 @@ i3Font load_font(const char *pattern, const bool fallback) {
                      error->error_code);
         }
     }
-    if (error != NULL) {
-        free(error);
-    }
+    free(error);
 
     font.pattern = sstrdup(pattern);
     LOG("Using X font %s\n", pattern);
@@ -275,8 +273,7 @@ void free_font(void) {
         case FONT_TYPE_XCB: {
             /* Close the font and free the info */
             xcb_close_font(conn, savedFont->specific.xcb.id);
-            if (savedFont->specific.xcb.info)
-                free(savedFont->specific.xcb.info);
+            free(savedFont->specific.xcb.info);
             break;
         }
         case FONT_TYPE_PANGO:

diff --git a/src/commands_parser.c b/src/commands_parser.c
index 98f0665907dd36d759abebd4a55b09024a2f55c6..4299c008335570ced9c8daebc12bdaa1cefd74e9 100644 (file)
--- a/src/commands_parser.c
+++ b/src/commands_parser.c
@@ -157,7 +157,7 @@ static long get_long(const char *identifier) {
 // TODO move to a common util
 static void clear_stack(void) {
     for (int c = 0; c < 10; c++) {
-        if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
+        if (stack[c].type == STACK_STR)
             free(stack[c].val.str);
         stack[c].identifier = NULL;
         stack[c].val.str = NULL;

diff --git a/src/config_parser.c b/src/config_parser.c
index 2d3f3bb919eb2d134baa61f9e510880275fd8210..9f972fed8f80b4510931cac6edb52cef431c832a 100644 (file)
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -171,7 +171,7 @@ static long get_long(const char *identifier) {
 
 static void clear_stack(void) {
     for (int c = 0; c < 10; c++) {
-        if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
+        if (stack[c].type == STACK_STR)
             free(stack[c].val.str);
         stack[c].identifier = NULL;
         stack[c].val.str = NULL;

diff --git a/src/load_layout.c b/src/load_layout.c
index 32da9c47f107ef9ddf8b12b2522a0c8218dd57e5..5a340d2c6c28bfc1befb96829a9276172dcd3b74 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -153,8 +153,7 @@ static int json_end_map(void *ctx) {
                 free(marks[i]);
             }
 
-            free(marks);
-            marks = NULL;
+            FREE(marks);
             num_marks = 0;
         }
 

diff --git a/src/util.c b/src/util.c
index a59283a8dd044a788a645b3296b481bcce4c621d..594d2bb6d038b0c943681197cd2a8aaf7a5f2a09 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -501,8 +501,7 @@ ssize_t slurp(const char *path, char **buf) {
     fclose(f);
     if ((ssize_t)n != stbuf.st_size) {
         ELOG("File \"%s\" could not be read entirely: got %zd, want %" PRIi64 "\n", path, n, (int64_t)stbuf.st_size);
-        free(*buf);
-        *buf = NULL;
+        FREE(*buf);
         return -1;
     }
     return (ssize_t)n;