CLEANUP: Reapply ha_free.cocci (2)

This reapplies ha_free.cocci across the whole src/ tree.

diff --git a/src/haterm_init.c b/src/haterm_init.c
index a56ac3eb3238672d818f9ed07d4fe9a1450bfc4f..f43ca5630f2f85615c19add50531106ce3deb278 100644 (file)
--- a/src/haterm_init.c
+++ b/src/haterm_init.c
@@ -80,8 +80,7 @@ static struct hbuf *hbuf_alloc(struct hbuf *h)
 
 static inline void free_hbuf(struct hbuf *h)
 {
 
 static inline void free_hbuf(struct hbuf *h)
 {

-       free(h->area);
-       h->area = NULL;
+       ha_free(&h->area);

 }
 
 __attribute__ ((format(printf, 2, 3)))
 }
 
 __attribute__ ((format(printf, 2, 3)))

diff --git a/src/tools.c b/src/tools.c
index 2687c2cdc4d22c2c2b2c121b29e1525728515f0e..3adc7cf3f315940981b02630da8e9fab830459e4 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -7565,8 +7565,7 @@ int backup_env(void)
                                free(*tmp);
                                tmp++;
                        }
                                free(*tmp);
                                tmp++;
                        }

-                       free(init_env);
-                       init_env = NULL;
+                       ha_free(&init_env);

                        return -1;
                }
                tmp++;
                        return -1;
                }
                tmp++;


@@ -7761,8 +7760,7 @@ void ha_freearray(char ***array)
        char **r = *array;
 
        for (i = 0; r && r[i]; i++) {
        char **r = *array;
 
        for (i = 0; r && r[i]; i++) {

-               free(r[i]);
-               r[i] = NULL;
+               ha_free(&r[i]);

        }
        *array = NULL;
 }
        }
        *array = NULL;
 }