coccinelle: make use of the "type" FREE_AND_NULL() rule

Apply the result of the just-added coccinelle rule. This manually
excludes a few occurrences, mostly things that resulted in many
FREE_AND_NULL() on one line, that'll be manually fixed in a subsequent
change.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/alias.c b/alias.c
index 3b90397a99d9f7ed4a0c1c5a83f5e69c879e752f..911481855f555c29c0b50a04d954accdf5b1c6f2 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -47,8 +47,7 @@ int split_cmdline(char *cmdline, const char ***argv)
                                src++;
                                c = cmdline[src];
                                if (!c) {
                                src++;
                                c = cmdline[src];
                                if (!c) {

-                                       free(*argv);
-                                       *argv = NULL;
+                                       FREE_AND_NULL(*argv);

                                        return -SPLIT_CMDLINE_BAD_ENDING;
                                }
                        }
                                        return -SPLIT_CMDLINE_BAD_ENDING;
                                }
                        }


@@ -60,8 +59,7 @@ int split_cmdline(char *cmdline, const char ***argv)
        cmdline[dst] = 0;
 
        if (quoted) {
        cmdline[dst] = 0;
 
        if (quoted) {

-               free(*argv);
-               *argv = NULL;
+               FREE_AND_NULL(*argv);

                return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
        }
 
                return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
        }
 

diff --git a/apply.c b/apply.c
index 854faa67795bcd356b33420f46260f208c2ec047..e78de0affa92beb8408304d4fe90684891017766 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3705,8 +3705,7 @@ static int check_preimage(struct apply_state *state,
  is_new:
        patch->is_new = 1;
        patch->is_delete = 0;
  is_new:
        patch->is_new = 1;
        patch->is_delete = 0;

-       free(patch->old_name);
-       patch->old_name = NULL;
+       FREE_AND_NULL(patch->old_name);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/attr.c b/attr.c
index 821203e2a980c329fc065a0dfabe37ef67a4bbbe..ebdcfb0b8a8e9ddb50f559336146140b4b167e06 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -638,13 +638,11 @@ void attr_check_reset(struct attr_check *check)
 
 void attr_check_clear(struct attr_check *check)
 {
 
 void attr_check_clear(struct attr_check *check)
 {

-       free(check->items);
-       check->items = NULL;
+       FREE_AND_NULL(check->items);

        check->alloc = 0;
        check->nr = 0;
 
        check->alloc = 0;
        check->nr = 0;
 

-       free(check->all_attrs);
-       check->all_attrs = NULL;
+       FREE_AND_NULL(check->all_attrs);

        check->all_attrs_nr = 0;
 
        drop_attr_stack(&check->stack);
        check->all_attrs_nr = 0;
 
        drop_attr_stack(&check->stack);

diff --git a/branch.c b/branch.c
index 985316eb76505a60bca0aa303322bef35e7defaa..2347cb86495c97d4e6941c72b31895c865ed421c 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -24,8 +24,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
                } else {
                        free(tracking->spec.src);
                        if (tracking->src) {
                } else {
                        free(tracking->spec.src);
                        if (tracking->src) {

-                               free(tracking->src);
-                               tracking->src = NULL;
+                               FREE_AND_NULL(tracking->src);

                        }
                }
                tracking->spec.src = NULL;
                        }
                }
                tracking->spec.src = NULL;

diff --git a/builtin/am.c b/builtin/am.c
index 8881d736151bf266cc8544a717cba960c078eff5..138fb98537c53a2dd5ed1557f5774d73fdc08a8a 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -483,8 +483,7 @@ static int run_applypatch_msg_hook(struct am_state *state)
        ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
 
        if (!ret) {
        ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
 
        if (!ret) {

-               free(state->msg);
-               state->msg = NULL;
+               FREE_AND_NULL(state->msg);

                if (read_commit_msg(state) < 0)
                        die(_("'%s' was deleted by the applypatch-msg hook"),
                                am_path(state, "final-commit"));
                if (read_commit_msg(state) < 0)
                        die(_("'%s' was deleted by the applypatch-msg hook"),
                                am_path(state, "final-commit"));

diff --git a/builtin/clean.c b/builtin/clean.c
index 142bf668cffe814006fae791f1bdc6b20fe6f366..bff5a07330ea2e7e2609d4fb138ff71b7f527614 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -837,8 +837,7 @@ static void interactive_main_loop(void)
                        int ret;
                        ret = menus[*chosen].fn();
                        if (ret != MENU_RETURN_NO_LOOP) {
                        int ret;
                        ret = menus[*chosen].fn();
                        if (ret != MENU_RETURN_NO_LOOP) {

-                               free(chosen);
-                               chosen = NULL;
+                               FREE_AND_NULL(chosen);

                                if (!del_list.nr) {
                                        clean_print_color(CLEAN_COLOR_ERROR);
                                        printf_ln(_("No more files to clean, exiting."));
                                if (!del_list.nr) {
                                        clean_print_color(CLEAN_COLOR_ERROR);
                                        printf_ln(_("No more files to clean, exiting."));


@@ -851,8 +850,7 @@ static void interactive_main_loop(void)
                        quit_cmd();
                }
 
                        quit_cmd();
                }
 

-               free(chosen);
-               chosen = NULL;
+               FREE_AND_NULL(chosen);

                break;
        }
 }
                break;
        }
 }

diff --git a/builtin/config.c b/builtin/config.c
index 7f6c25d4d95b37f7785e0b6872d059095548c87f..18c2158630d85b389f43204fa58c538c0d021b40 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -214,8 +214,7 @@ static int get_value(const char *key_, const char *regex_)
                key_regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(key_regexp, key, REG_EXTENDED)) {
                        error("invalid key pattern: %s", key_);
                key_regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(key_regexp, key, REG_EXTENDED)) {
                        error("invalid key pattern: %s", key_);

-                       free(key_regexp);
-                       key_regexp = NULL;
+                       FREE_AND_NULL(key_regexp);

                        ret = CONFIG_INVALID_PATTERN;
                        goto free_strings;
                }
                        ret = CONFIG_INVALID_PATTERN;
                        goto free_strings;
                }


@@ -235,8 +234,7 @@ static int get_value(const char *key_, const char *regex_)
                regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(regexp, regex_, REG_EXTENDED)) {
                        error("invalid pattern: %s", regex_);
                regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(regexp, regex_, REG_EXTENDED)) {
                        error("invalid pattern: %s", regex_);

-                       free(regexp);
-                       regexp = NULL;
+                       FREE_AND_NULL(regexp);

                        ret = CONFIG_INVALID_PATTERN;
                        goto free_strings;
                }
                        ret = CONFIG_INVALID_PATTERN;
                        goto free_strings;
                }

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 04b9dcaf0f4ca90712cbb85cace521e226194f3b..f3b16520c2e838fd6fb29aaa61e548fc7218b9c4 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -388,8 +388,7 @@ static struct base_data *alloc_base_data(void)
 static void free_base_data(struct base_data *c)
 {
        if (c->data) {
 static void free_base_data(struct base_data *c)
 {
        if (c->data) {

-               free(c->data);
-               c->data = NULL;
+               FREE_AND_NULL(c->data);

                get_thread_data()->base_cache_used -= c->size;
        }
 }
                get_thread_data()->base_cache_used -= c->size;
        }
 }


@@ -605,8 +604,7 @@ static void *unpack_data(struct object_entry *obj,
        git_inflate_end(&stream);
        free(inbuf);
        if (consume) {
        git_inflate_end(&stream);
        free(inbuf);
        if (consume) {

-               free(data);
-               data = NULL;
+               FREE_AND_NULL(data);

        }
        return data;
 }
        }
        return data;
 }

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f672225def033595602bc4ff91ee26edd9804944..790615b2c3a5782e9233206f4edaa277de6c9972 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -264,8 +264,7 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent
                 * make sure no cached delta data remains from a
                 * previous attempt before a pack split occurred.
                 */
                 * make sure no cached delta data remains from a
                 * previous attempt before a pack split occurred.
                 */

-               free(entry->delta_data);
-               entry->delta_data = NULL;
+               FREE_AND_NULL(entry->delta_data);

                entry->z_delta_size = 0;
        } else if (entry->delta_data) {
                size = entry->delta_size;
                entry->z_delta_size = 0;
        } else if (entry->delta_data) {
                size = entry->delta_size;


@@ -1375,12 +1374,10 @@ static void cleanup_preferred_base(void)
                if (!pbase_tree_cache[i])
                        continue;
                free(pbase_tree_cache[i]->tree_data);
                if (!pbase_tree_cache[i])
                        continue;
                free(pbase_tree_cache[i]->tree_data);

-               free(pbase_tree_cache[i]);
-               pbase_tree_cache[i] = NULL;
+               FREE_AND_NULL(pbase_tree_cache[i]);

        }
 
        }
 

-       free(done_pbase_paths);
-       done_pbase_paths = NULL;
+       FREE_AND_NULL(done_pbase_paths);

        done_pbase_paths_num = done_pbase_paths_alloc = 0;
 }
 
        done_pbase_paths_num = done_pbase_paths_alloc = 0;
 }
 


@@ -1970,8 +1967,7 @@ static unsigned long free_unpacked(struct unpacked *n)
        n->index = NULL;
        if (n->data) {
                freed_mem += n->entry->size;
        n->index = NULL;
        if (n->data) {
                freed_mem += n->entry->size;

-               free(n->data);
-               n->data = NULL;
+               FREE_AND_NULL(n->data);

        }
        n->entry = NULL;
        n->depth = 0;
        }
        n->entry = NULL;
        n->depth = 0;

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 8bc9997767adbb77cc8af81b2b289e22f2b61c5a..60bfe487893f9ac6c2523242f20ad3d335e3a7fd 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -112,8 +112,7 @@ static void *get_data(unsigned long size)
                        break;
                if (ret != Z_OK) {
                        error("inflate returned %d", ret);
                        break;
                if (ret != Z_OK) {
                        error("inflate returned %d", ret);

-                       free(buf);
-                       buf = NULL;
+                       FREE_AND_NULL(buf);

                        if (!recover)
                                exit(1);
                        has_errors = 1;
                        if (!recover)
                                exit(1);
                        has_errors = 1;

diff --git a/commit.c b/commit.c
index 99846d9bf467be8e737341795054588475c65855..cbfd6899392e8715b206c96b3b58cbdaf29c77cd 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -287,8 +287,7 @@ void free_commit_buffer(struct commit *commit)
 {
        struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
        if (v) {
 {
        struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
        if (v) {

-               free(v->buffer);
-               v->buffer = NULL;
+               FREE_AND_NULL(v->buffer);

                v->size = 0;
        }
 }
                v->size = 0;
        }
 }

diff --git a/config.c b/config.c
index 34a139c40bd57ff2dd23318beca53fd2e2948000..0501a60dd241320b686fa76ff570fd72ff9ce895 100644 (file)
--- a/config.c
+++ b/config.c
@@ -395,8 +395,7 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele
 
 out_free_ret_1:
        if (store_key) {
 
 out_free_ret_1:
        if (store_key) {

-               free(*store_key);
-               *store_key = NULL;
+               FREE_AND_NULL(*store_key);

        }
        return -CONFIG_INVALID_KEY;
 }
        }
        return -CONFIG_INVALID_KEY;
 }

diff --git a/credential.c b/credential.c
index aa996669fc40021e0c8cb01fa8021da7064e2781..0ab247ff40a03b6da6281814cc7b41edca934bb5 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -93,8 +93,7 @@ static void credential_apply_config(struct credential *c)
        c->configured = 1;
 
        if (!c->use_http_path && proto_is_http(c->protocol)) {
        c->configured = 1;
 
        if (!c->use_http_path && proto_is_http(c->protocol)) {

-               free(c->path);
-               c->path = NULL;
+               FREE_AND_NULL(c->path);

        }
 }
 
        }
 }
 

diff --git a/diff-lib.c b/diff-lib.c
index 76c8f185cd032b92e010b95e4d92e3b08a6ab18a..7528f4163f87f10628405e6e82e9facac7e0fc35 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -179,8 +179,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                                free(dpath);
                                continue;
                        }
                                free(dpath);
                                continue;
                        }

-                       free(dpath);
-                       dpath = NULL;
+                       FREE_AND_NULL(dpath);

 
                        /*
                         * Show the diff for the 'ce' if we found the one
 
                        /*
                         * Show the diff for the 'ce' if we found the one

diff --git a/diff.c b/diff.c
index e35cf6c704505f4a56dc39f0dd39c6691acd1c9b..3561adf49f3f742d88767f63980c7a17bd27ff20 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1218,8 +1218,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)
                        regfree(ecbdata->diff_words->word_regex);
                        free(ecbdata->diff_words->word_regex);
                }
                        regfree(ecbdata->diff_words->word_regex);
                        free(ecbdata->diff_words->word_regex);
                }

-               free(ecbdata->diff_words);
-               ecbdata->diff_words = NULL;
+               FREE_AND_NULL(ecbdata->diff_words);

        }
 }
 
        }
 }
 


@@ -2951,8 +2950,7 @@ void diff_free_filespec_blob(struct diff_filespec *s)
 void diff_free_filespec_data(struct diff_filespec *s)
 {
        diff_free_filespec_blob(s);
 void diff_free_filespec_data(struct diff_filespec *s)
 {
        diff_free_filespec_blob(s);

-       free(s->cnt_data);
-       s->cnt_data = NULL;
+       FREE_AND_NULL(s->cnt_data);

 }
 
 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
 }
 
 static void prep_temp_blob(const char *path, struct diff_tempfile *temp,

diff --git a/diffcore-rename.c b/diffcore-rename.c
index f7444c86bde3909c8fca23f71c4852514eb26b88..6d8daf9c003587b7b96cccc29aa63b78365ef40e 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -667,11 +667,9 @@ void diffcore_rename(struct diff_options *options)
        for (i = 0; i < rename_dst_nr; i++)
                free_filespec(rename_dst[i].two);
 
        for (i = 0; i < rename_dst_nr; i++)
                free_filespec(rename_dst[i].two);
 

-       free(rename_dst);
-       rename_dst = NULL;
+       FREE_AND_NULL(rename_dst);

        rename_dst_nr = rename_dst_alloc = 0;
        rename_dst_nr = rename_dst_alloc = 0;

-       free(rename_src);
-       rename_src = NULL;
+       FREE_AND_NULL(rename_src);

        rename_src_nr = rename_src_alloc = 0;
        return;
 }
        rename_src_nr = rename_src_alloc = 0;
        return;
 }

diff --git a/dir.c b/dir.c
index 17590638176f26e35f3a728e5cd56917e0568541..7dc168b80621fa5a196dd27066c5b95b3a0a1915 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -2117,8 +2117,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
                for (i = j = 0; j < dir->nr; j++) {
                        if (i &&
                            check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) {
                for (i = j = 0; j < dir->nr; j++) {
                        if (i &&
                            check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) {

-                               free(dir->entries[j]);
-                               dir->entries[j] = NULL;
+                               FREE_AND_NULL(dir->entries[j]);

                        } else {
                                dir->entries[i++] = dir->entries[j];
                        }
                        } else {
                                dir->entries[i++] = dir->entries[j];
                        }


@@ -2144,8 +2143,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
                     dir->untracked->dir_invalidated))
                        istate->cache_changed |= UNTRACKED_CHANGED;
                if (dir->untracked != istate->untracked) {
                     dir->untracked->dir_invalidated))
                        istate->cache_changed |= UNTRACKED_CHANGED;
                if (dir->untracked != istate->untracked) {

-                       free(dir->untracked);
-                       dir->untracked = NULL;
+                       FREE_AND_NULL(dir->untracked);

                }
        }
        return dir->nr;
                }
        }
        return dir->nr;


@@ -2488,8 +2486,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
        strbuf_addbuf(out, &untracked->ident);
 
        strbuf_add(out, ouc, ouc_size(len));
        strbuf_addbuf(out, &untracked->ident);
 
        strbuf_add(out, ouc, ouc_size(len));

-       free(ouc);
-       ouc = NULL;
+       FREE_AND_NULL(ouc);

 
        if (!untracked->root) {
                varint_len = encode_varint(0, varbuf);
 
        if (!untracked->root) {
                varint_len = encode_varint(0, varbuf);

diff --git a/fast-import.c b/fast-import.c
index 9a22fc92c0d029cf2a1362ea846f75f59978e870..eeab927d5ab9f8bca61e68ef3fe29b565a11fdc1 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1063,8 +1063,7 @@ static void end_packfile(void)
                close(pack_data->pack_fd);
                unlink_or_warn(pack_data->pack_name);
        }
                close(pack_data->pack_fd);
                unlink_or_warn(pack_data->pack_name);
        }

-       free(pack_data);
-       pack_data = NULL;
+       FREE_AND_NULL(pack_data);

        running = 0;
 
        /* We can't carry a delta across packfiles. */
        running = 0;
 
        /* We can't carry a delta across packfiles. */


@@ -1149,8 +1148,7 @@ static int store_object(
 
                /* We cannot carry a delta into the new pack. */
                if (delta) {
 
                /* We cannot carry a delta into the new pack. */
                if (delta) {

-                       free(delta);
-                       delta = NULL;
+                       FREE_AND_NULL(delta);

 
                        git_deflate_init(&s, pack_compression_level);
                        s.next_in = (void *)dat->buf;
 
                        git_deflate_init(&s, pack_compression_level);
                        s.next_in = (void *)dat->buf;

diff --git a/grep.c b/grep.c
index d03d424e5cf8d32d91e3082555d8add674e01486..11513ec06dc7e872c83c075a49990536980d5c02 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1778,8 +1778,7 @@ void grep_source_clear_data(struct grep_source *gs)
        case GREP_SOURCE_FILE:
        case GREP_SOURCE_SHA1:
        case GREP_SOURCE_SUBMODULE:
        case GREP_SOURCE_FILE:
        case GREP_SOURCE_SHA1:
        case GREP_SOURCE_SUBMODULE:

-               free(gs->buf);
-               gs->buf = NULL;
+               FREE_AND_NULL(gs->buf);

                gs->size = 0;
                break;
        case GREP_SOURCE_BUF:
                gs->size = 0;
                break;
        case GREP_SOURCE_BUF:

diff --git a/http-push.c b/http-push.c
index 67c4d4b472cb1065bcfa20007fdbca55ac8e0052..c91f40a610541d6201edf2a2c95b8fef203f3c2f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -291,8 +291,7 @@ static void start_mkcol(struct transfer_request *request)
                request->state = RUN_MKCOL;
        } else {
                request->state = ABORTED;
                request->state = RUN_MKCOL;
        } else {
                request->state = ABORTED;

-               free(request->url);
-               request->url = NULL;
+               FREE_AND_NULL(request->url);

        }
 }
 #endif
        }
 }
 #endif


@@ -409,8 +408,7 @@ static void start_put(struct transfer_request *request)
                request->state = RUN_PUT;
        } else {
                request->state = ABORTED;
                request->state = RUN_PUT;
        } else {
                request->state = ABORTED;

-               free(request->url);
-               request->url = NULL;
+               FREE_AND_NULL(request->url);

        }
 }
 
        }
 }
 


@@ -432,8 +430,7 @@ static void start_move(struct transfer_request *request)
                request->state = RUN_MOVE;
        } else {
                request->state = ABORTED;
                request->state = RUN_MOVE;
        } else {
                request->state = ABORTED;

-               free(request->url);
-               request->url = NULL;
+               FREE_AND_NULL(request->url);

        }
 }
 
        }
 }
 


@@ -526,8 +523,7 @@ static void finish_request(struct transfer_request *request)
 
        /* URL is reused for MOVE after PUT */
        if (request->state != RUN_PUT) {
 
        /* URL is reused for MOVE after PUT */
        if (request->state != RUN_PUT) {

-               free(request->url);
-               request->url = NULL;
+               FREE_AND_NULL(request->url);

        }
 
        if (request->state == RUN_MKCOL) {
        }
 
        if (request->state == RUN_MKCOL) {


@@ -803,8 +799,7 @@ xml_start_tag(void *userData, const char *name, const char **atts)
        }
        xsnprintf(ctx->name + old_namelen, ctx->len - old_namelen, ".%s", c);
 
        }
        xsnprintf(ctx->name + old_namelen, ctx->len - old_namelen, ".%s", c);
 

-       free(ctx->cdata);
-       ctx->cdata = NULL;
+       FREE_AND_NULL(ctx->cdata);

 
        ctx->userFunc(ctx, 0);
 }
 
        ctx->userFunc(ctx, 0);
 }


@@ -932,8 +927,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
                free(lock->token);
                free(lock->owner);
                free(url);
                free(lock->token);
                free(lock->owner);
                free(url);

-               free(lock);
-               lock = NULL;
+               FREE_AND_NULL(lock);

        } else {
                lock->url = url;
                lock->start_time = time(NULL);
        } else {
                lock->url = url;
                lock->start_time = time(NULL);


@@ -1105,8 +1099,7 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
                        ls->dentry_flags |= IS_DIR;
                }
        } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {
                        ls->dentry_flags |= IS_DIR;
                }
        } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {

-               free(ls->dentry_name);
-               ls->dentry_name = NULL;
+               FREE_AND_NULL(ls->dentry_name);

                ls->dentry_flags = 0;
        }
 }
                ls->dentry_flags = 0;
        }
 }


@@ -1547,8 +1540,7 @@ static void fetch_symref(const char *path, char **symref, struct object_id *oid)
                    curl_errorstr);
        free(url);
 
                    curl_errorstr);
        free(url);
 

-       free(*symref);
-       *symref = NULL;
+       FREE_AND_NULL(*symref);

        oidclr(oid);
 
        if (buffer.len == 0)
        oidclr(oid);
 
        if (buffer.len == 0)

diff --git a/http.c b/http.c
index d2e11ec6f012d3b2a9570f0c322aebf53a13cc0a..77f46bef0f50b7614b1c48a32c06b371c13b0bbb 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1026,8 +1026,7 @@ void http_cleanup(void)
 
        if (proxy_auth.password) {
                memset(proxy_auth.password, 0, strlen(proxy_auth.password));
 
        if (proxy_auth.password) {
                memset(proxy_auth.password, 0, strlen(proxy_auth.password));

-               free(proxy_auth.password);
-               proxy_auth.password = NULL;
+               FREE_AND_NULL(proxy_auth.password);

        }
 
        free((void *)curl_proxyuserpwd);
        }
 
        free((void *)curl_proxyuserpwd);


@@ -1038,13 +1037,11 @@ void http_cleanup(void)
 
        if (cert_auth.password != NULL) {
                memset(cert_auth.password, 0, strlen(cert_auth.password));
 
        if (cert_auth.password != NULL) {
                memset(cert_auth.password, 0, strlen(cert_auth.password));

-               free(cert_auth.password);
-               cert_auth.password = NULL;
+               FREE_AND_NULL(cert_auth.password);

        }
        ssl_cert_password_required = 0;
 
        }
        ssl_cert_password_required = 0;
 

-       free(cached_accept_language);
-       cached_accept_language = NULL;
+       FREE_AND_NULL(cached_accept_language);

 }
 
 struct active_request_slot *get_active_slot(void)
 }
 
 struct active_request_slot *get_active_slot(void)


@@ -1896,8 +1893,7 @@ static char *fetch_pack_index(unsigned char *sha1, const char *base_url)
 
        if (http_get_file(url, tmp, NULL) != HTTP_OK) {
                error("Unable to get pack index %s", url);
 
        if (http_get_file(url, tmp, NULL) != HTTP_OK) {
                error("Unable to get pack index %s", url);

-               free(tmp);
-               tmp = NULL;
+               FREE_AND_NULL(tmp);

        }
 
        free(url);
        }
 
        free(url);


@@ -2328,8 +2324,7 @@ void release_http_object_request(struct http_object_request *freq)
                freq->localfile = -1;
        }
        if (freq->url != NULL) {
                freq->localfile = -1;
        }
        if (freq->url != NULL) {

-               free(freq->url);
-               freq->url = NULL;
+               FREE_AND_NULL(freq->url);

        }
        if (freq->slot != NULL) {
                freq->slot->callback_func = NULL;
        }
        if (freq->slot != NULL) {
                freq->slot->callback_func = NULL;

diff --git a/imap-send.c b/imap-send.c
index 857591660f485d65dec3390b22dd2083c94d7a44..40ddb496e6b7b9b1d9db9f16e0cf5ae5a9396892 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -776,8 +776,7 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
                               offsetof(struct imap_cmd, next));
                        if (cmdp->cb.data) {
                                n = socket_write(&imap->buf.sock, cmdp->cb.data, cmdp->cb.dlen);
                               offsetof(struct imap_cmd, next));
                        if (cmdp->cb.data) {
                                n = socket_write(&imap->buf.sock, cmdp->cb.data, cmdp->cb.dlen);

-                               free(cmdp->cb.data);
-                               cmdp->cb.data = NULL;
+                               FREE_AND_NULL(cmdp->cb.data);

                                if (n != (int)cmdp->cb.dlen)
                                        return RESP_BAD;
                        } else if (cmdp->cb.cont) {
                                if (n != (int)cmdp->cb.dlen)
                                        return RESP_BAD;
                        } else if (cmdp->cb.cont) {

diff --git a/line-log.c b/line-log.c
index b9087814b8ccd0082efc41c617e33e8046ea17d5..79eded7363bce69c1d540a66ed3ba2d74310d50f 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -610,8 +610,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)
                line_log_data_insert(&ranges, full_name, begin, end);
 
                free_filespec(spec);
                line_log_data_insert(&ranges, full_name, begin, end);
 
                free_filespec(spec);

-               free(ends);
-               ends = NULL;
+               FREE_AND_NULL(ends);

        }
 
        for (p = ranges; p; p = p->next)
        }
 
        for (p = ranges; p; p = p->next)

diff --git a/mailinfo.c b/mailinfo.c
index f92cb9f729ca05ae1e80c9c27bc102dbb64a8dc0..44f829edb169ad4f3822b5a8cc1a7b0f6037087b 100644 (file)
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -919,8 +919,7 @@ static int handle_boundary(struct mailinfo *mi, struct strbuf *line)
                /* we hit an end boundary */
                /* pop the current boundary off the stack */
                strbuf_release(*(mi->content_top));
                /* we hit an end boundary */
                /* pop the current boundary off the stack */
                strbuf_release(*(mi->content_top));

-               free(*(mi->content_top));
-               *(mi->content_top) = NULL;
+               FREE_AND_NULL(*(mi->content_top));

 
                /* technically won't happen as is_multipart_boundary()
                   will fail first.  But just in case..
 
                /* technically won't happen as is_multipart_boundary()
                   will fail first.  But just in case..

diff --git a/object.c b/object.c
index 06ba3a11d87ad7b93f29aef535e773fcc4683004..f818777412187890b88a6c90507b8b41f131487c 100644 (file)
--- a/object.c
+++ b/object.c
@@ -377,8 +377,7 @@ void object_array_clear(struct object_array *array)
        int i;
        for (i = 0; i < array->nr; i++)
                object_array_release_entry(&array->objects[i]);
        int i;
        for (i = 0; i < array->nr; i++)
                object_array_release_entry(&array->objects[i]);

-       free(array->objects);
-       array->objects = NULL;
+       FREE_AND_NULL(array->objects);

        array->nr = array->alloc = 0;
 }
 
        array->nr = array->alloc = 0;
 }
 

diff --git a/pathspec.c b/pathspec.c
index 828405021fca4214585e1d46b65f604d14e61143..54aab8bc0146c6f2213993f40f5a3b3ac026569a 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -662,7 +662,6 @@ void clear_pathspec(struct pathspec *pathspec)
                        attr_check_free(pathspec->items[i].attr_check);
        }
 
                        attr_check_free(pathspec->items[i].attr_check);
        }
 

-       free(pathspec->items);
-       pathspec->items = NULL;
+       FREE_AND_NULL(pathspec->items);

        pathspec->nr = 0;
 }
        pathspec->nr = 0;
 }

diff --git a/read-cache.c b/read-cache.c
index bc156a133e9ff197e3d98c63d66f2d958f47f564..66c413657e7e51a839d9baab1c5ab79a23b6280e 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1888,8 +1888,7 @@ int discard_index(struct index_state *istate)
        free_name_hash(istate);
        cache_tree_free(&(istate->cache_tree));
        istate->initialized = 0;
        free_name_hash(istate);
        cache_tree_free(&(istate->cache_tree));
        istate->initialized = 0;

-       free(istate->cache);
-       istate->cache = NULL;
+       FREE_AND_NULL(istate->cache);

        istate->cache_alloc = 0;
        discard_split_index(istate);
        free_untracked_cache(istate->untracked);
        istate->cache_alloc = 0;
        discard_split_index(istate);
        free_untracked_cache(istate->untracked);


@@ -2603,8 +2602,7 @@ void *read_blob_data_from_index(const struct index_state *istate,
 
 void stat_validity_clear(struct stat_validity *sv)
 {
 
 void stat_validity_clear(struct stat_validity *sv)
 {

-       free(sv->sd);
-       sv->sd = NULL;
+       FREE_AND_NULL(sv->sd);

 }
 
 int stat_validity_check(struct stat_validity *sv, const char *path)
 }
 
 int stat_validity_check(struct stat_validity *sv, const char *path)

diff --git a/ref-filter.c b/ref-filter.c
index ab32bc9c3145c85c839c660c54b61f13fe9cb51a..72e6cb8ecc3e46481239314d27f48a1c8a392518 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1891,8 +1891,7 @@ void ref_array_clear(struct ref_array *array)
 
        for (i = 0; i < array->nr; i++)
                free_array_item(array->items[i]);
 
        for (i = 0; i < array->nr; i++)
                free_array_item(array->items[i]);

-       free(array->items);
-       array->items = NULL;
+       FREE_AND_NULL(array->items);

        array->nr = array->alloc = 0;
 }
 
        array->nr = array->alloc = 0;
 }
 

diff --git a/refs/files-backend.c b/refs/files-backend.c
index d8b3f73147c8af88597ad71259aef0a9f53dd104..c1bd99d60fa5f5773de3b49b70a4a0bca1643174 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2944,8 +2944,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
                                       head_oid.hash, &head_type);
 
        if (head_ref && !(head_type & REF_ISSYMREF)) {
                                       head_oid.hash, &head_type);
 
        if (head_ref && !(head_type & REF_ISSYMREF)) {

-               free(head_ref);
-               head_ref = NULL;
+               FREE_AND_NULL(head_ref);

        }
 
        /*
        }
 
        /*

diff --git a/remote-testsvn.c b/remote-testsvn.c
index 50404ef3438f37ae33e3590f1e7205581087f75a..078b0c3139e6797f9021876c7a8f1906901f70b1 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -66,8 +66,7 @@ static char *read_ref_note(const unsigned char sha1[20])
        else if (!msglen || type != OBJ_BLOB) {
                error("Note contains unusable content. "
                        "Is something else using this notes tree? %s", notes_ref);
        else if (!msglen || type != OBJ_BLOB) {
                error("Note contains unusable content. "
                        "Is something else using this notes tree? %s", notes_ref);

-               free(msg);
-               msg = NULL;
+               FREE_AND_NULL(msg);

        }
        free_notes(NULL);
        return msg;
        }
        free_notes(NULL);
        return msg;

diff --git a/sequencer.c b/sequencer.c
index 5282fb849c5c27e98bbe1b506340c906aa37995c..070b42f240474dfb03f85ea1bb5b1a21c464400a 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1211,8 +1211,7 @@ struct todo_list {
 static void todo_list_release(struct todo_list *todo_list)
 {
        strbuf_release(&todo_list->buf);
 static void todo_list_release(struct todo_list *todo_list)
 {
        strbuf_release(&todo_list->buf);

-       free(todo_list->items);
-       todo_list->items = NULL;
+       FREE_AND_NULL(todo_list->items);

        todo_list->nr = todo_list->alloc = 0;
 }
 
        todo_list->nr = todo_list->alloc = 0;
 }
 

diff --git a/sha1-array.c b/sha1-array.c
index 7d646ab5b8cf80e47c6c1f339affeaa76a41d2d2..838b3bf8478cfdfcd78f866e69dc0f8c5cbf3c9e 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -35,8 +35,7 @@ int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
 
 void oid_array_clear(struct oid_array *array)
 {
 
 void oid_array_clear(struct oid_array *array)
 {

-       free(array->oid);
-       array->oid = NULL;
+       FREE_AND_NULL(array->oid);

        array->nr = 0;
        array->alloc = 0;
        array->sorted = 0;
        array->nr = 0;
        array->alloc = 0;
        array->sorted = 0;

diff --git a/sha1_file.c b/sha1_file.c
index 59a4ed2ed32336b41ab8f3b1d4aca30f045aa084..d67c88bb8d3483475ce8b6ecd7330d30a9311a81 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -610,8 +610,7 @@ char *compute_alternate_path(const char *path, struct strbuf *err)
 
 out:
        if (seen_error) {
 
 out:
        if (seen_error) {

-               free(ref_git);
-               ref_git = NULL;
+               FREE_AND_NULL(ref_git);

        }
 
        return ref_git;
        }
 
        return ref_git;

diff --git a/transport-helper.c b/transport-helper.c
index 36408046eb28d8af3c90614f73ee8112855b4677..33cff38cc0b9b4a2d05b26544c9edda9caa33e9a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -242,8 +242,7 @@ static int disconnect_helper(struct transport *transport)
                close(data->helper->out);
                fclose(data->out);
                res = finish_command(data->helper);
                close(data->helper->out);
                fclose(data->out);
                res = finish_command(data->helper);

-               free(data->helper);
-               data->helper = NULL;
+               FREE_AND_NULL(data->helper);

        }
        return res;
 }
        }
        return res;
 }


@@ -711,43 +710,35 @@ static int push_update_ref_status(struct strbuf *buf,
 
                if (!strcmp(msg, "no match")) {
                        status = REF_STATUS_NONE;
 
                if (!strcmp(msg, "no match")) {
                        status = REF_STATUS_NONE;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "up to date")) {
                        status = REF_STATUS_UPTODATE;
                }
                else if (!strcmp(msg, "up to date")) {
                        status = REF_STATUS_UPTODATE;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "non-fast forward")) {
                        status = REF_STATUS_REJECT_NONFASTFORWARD;
                }
                else if (!strcmp(msg, "non-fast forward")) {
                        status = REF_STATUS_REJECT_NONFASTFORWARD;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "already exists")) {
                        status = REF_STATUS_REJECT_ALREADY_EXISTS;
                }
                else if (!strcmp(msg, "already exists")) {
                        status = REF_STATUS_REJECT_ALREADY_EXISTS;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "fetch first")) {
                        status = REF_STATUS_REJECT_FETCH_FIRST;
                }
                else if (!strcmp(msg, "fetch first")) {
                        status = REF_STATUS_REJECT_FETCH_FIRST;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "needs force")) {
                        status = REF_STATUS_REJECT_NEEDS_FORCE;
                }
                else if (!strcmp(msg, "needs force")) {
                        status = REF_STATUS_REJECT_NEEDS_FORCE;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "stale info")) {
                        status = REF_STATUS_REJECT_STALE;
                }
                else if (!strcmp(msg, "stale info")) {
                        status = REF_STATUS_REJECT_STALE;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
                else if (!strcmp(msg, "forced update")) {
                        forced = 1;
                }
                else if (!strcmp(msg, "forced update")) {
                        forced = 1;

-                       free(msg);
-                       msg = NULL;
+                       FREE_AND_NULL(msg);

                }
        }
 
                }
        }
 

diff --git a/transport.c b/transport.c
index 9bfcf870f9078f75349bd3b4976c71bbf5c49ebf..cf3508800132b8843d8dcad3f34f25feb593474b 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1145,8 +1145,7 @@ void transport_unlock_pack(struct transport *transport)
 {
        if (transport->pack_lockfile) {
                unlink_or_warn(transport->pack_lockfile);
 {
        if (transport->pack_lockfile) {
                unlink_or_warn(transport->pack_lockfile);

-               free(transport->pack_lockfile);
-               transport->pack_lockfile = NULL;
+               FREE_AND_NULL(transport->pack_lockfile);

        }
 }
 
        }
 }
 

diff --git a/tree-diff.c b/tree-diff.c
index e164e532b2f76617d822c3bef9492b9525b56e83..1e1b393d083935555058aed475ab804a839738c0 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -140,8 +140,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
        /* if last->next is !NULL - it is a pre-allocated memory, we can reuse */
        p = last->next;
        if (p && (alloclen > (intptr_t)p->next)) {
        /* if last->next is !NULL - it is a pre-allocated memory, we can reuse */
        p = last->next;
        if (p && (alloclen > (intptr_t)p->next)) {

-               free(p);
-               p = NULL;
+               FREE_AND_NULL(p);

        }
 
        if (!p) {
        }
 
        if (!p) {


@@ -559,8 +558,7 @@ struct combine_diff_path *diff_tree_paths(
         * (see path_appendnew() for details about why)
         */
        if (p->next) {
         * (see path_appendnew() for details about why)
         */
        if (p->next) {

-               free(p->next);
-               p->next = NULL;
+               FREE_AND_NULL(p->next);

        }
 
        return p;
        }
 
        return p;

diff --git a/tree.c b/tree.c
index 603b29ee805b00c4b1eeeebed51c917bfef7c009..614f91586d6f4d70815214812ace3e1981a697b5 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -226,8 +226,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)
 
 void free_tree_buffer(struct tree *tree)
 {
 
 void free_tree_buffer(struct tree *tree)
 {

-       free(tree->buffer);
-       tree->buffer = NULL;
+       FREE_AND_NULL(tree->buffer);

        tree->size = 0;
        tree->object.parsed = 0;
 }
        tree->size = 0;
        tree->object.parsed = 0;
 }