diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-06-15 23:15:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-16 12:44:07 -0700 |
| commit | e140f7afddcdce2bae062ea1578eac38c744e3a5 (patch) | |
| tree | df54a2725f418f14c64d7c0e97cb189cdbecd8c5 | |
| parent | coccinelle: add a rule to make "expression" code use FREE_AND_NULL() (diff) | |
| download | tgif-e140f7afddcdce2bae062ea1578eac38c744e3a5.tar.xz | |
coccinelle: make use of the "expression" FREE_AND_NULL() rule
A follow-up to the existing "expression" rule added in an earlier
change. 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>
| -rw-r--r-- | blame.c | 3 | ||||
| -rw-r--r-- | ll-merge.c | 3 |
2 files changed, 2 insertions, 4 deletions
@@ -314,8 +314,7 @@ static void fill_origin_blob(struct diff_options *opt, static void drop_origin_blob(struct blame_origin *o) { if (o->file.ptr) { - free(o->file.ptr); - o->file.ptr = NULL; + FREE_AND_NULL(o->file.ptr); } } diff --git a/ll-merge.c b/ll-merge.c index ac0d4a5d78..91ff519cef 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -209,8 +209,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, result->size = st.st_size; result->ptr = xmallocz(result->size); if (read_in_full(fd, result->ptr, result->size) != result->size) { - free(result->ptr); - result->ptr = NULL; + FREE_AND_NULL(result->ptr); result->size = 0; } close_bad: |