summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-06-15 23:15:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-16 19:44:09 (GMT)
commit88ce3ef636b1385e861ec0e9e2155248b999b032 (patch)
tree0da315e544f734755c717c04852b2c44ac3345d3 /grep.c
parente140f7afddcdce2bae062ea1578eac38c744e3a5 (diff)
downloadgit-88ce3ef636b1385e861ec0e9e2155248b999b032.zip
git-88ce3ef636b1385e861ec0e9e2155248b999b032.tar.gz
git-88ce3ef636b1385e861ec0e9e2155248b999b032.tar.bz2
*.[ch] refactoring: make use of the FREE_AND_NULL() macro
Replace occurrences of `free(ptr); ptr = NULL` which weren't caught by the coccinelle rule. These fall into two categories: - free/NULL assignments one after the other which coccinelle all put on one line, which is functionally equivalent code, but very ugly. - manually spotted occurrences where the NULL assignment isn't right after the free() call. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/grep.c b/grep.c
index 11513ec..909f35a 100644
--- a/grep.c
+++ b/grep.c
@@ -1763,12 +1763,9 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
void grep_source_clear(struct grep_source *gs)
{
- free(gs->name);
- gs->name = NULL;
- free(gs->path);
- gs->path = NULL;
- free(gs->identifier);
- gs->identifier = NULL;
+ FREE_AND_NULL(gs->name);
+ FREE_AND_NULL(gs->path);
+ FREE_AND_NULL(gs->identifier);
grep_source_clear_data(gs);
}