diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-06-16 01:15:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-16 21:44:03 +0200 |
| commit | 6a83d902073803c4141e02c53decf8c03e35da27 (patch) | |
| tree | 209cf1639a325875240fce3e1f1cabbdb25878df /tree-diff.c | |
| parent | coccinelle: add a rule to make "type" code use FREE_AND_NULL() (diff) | |
| download | git-6a83d902073803c4141e02c53decf8c03e35da27.tar.xz git-6a83d902073803c4141e02c53decf8c03e35da27.zip | |
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>
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tree-diff.c b/tree-diff.c index e164e532b2..1e1b393d08 100644 --- 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)) { - free(p); - p = NULL; + FREE_AND_NULL(p); } if (!p) { @@ -559,8 +558,7 @@ struct combine_diff_path *diff_tree_paths( * (see path_appendnew() for details about why) */ if (p->next) { - free(p->next); - p->next = NULL; + FREE_AND_NULL(p->next); } return p; |