diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:28:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-25 00:28:41 +0300 |
| commit | 50f03c6676ed5ea040dd53272882d3aac2ee1b48 (patch) | |
| tree | 8bf9680918762ffa077832674da9cca98c8c1888 /ll-merge.c | |
| parent | cda4ba30b1d6257524b9412ed4d7c44645fe0369 (diff) | |
| parent | 88ce3ef636b1385e861ec0e9e2155248b999b032 (diff) | |
Merge branch 'ab/free-and-null'
A common pattern to free a piece of memory and assign NULL to the
pointer that used to point at it has been replaced with a new
FREE_AND_NULL() macro.
* ab/free-and-null:
*.[ch] refactoring: make use of the FREE_AND_NULL() macro
coccinelle: make use of the "expression" FREE_AND_NULL() rule
coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
coccinelle: make use of the "type" FREE_AND_NULL() rule
coccinelle: add a rule to make "type" code use FREE_AND_NULL()
git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c index b9576efe97b..9fb855a9003 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -210,8 +210,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: |