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
This commit is contained in:
@ -389,8 +389,7 @@ static struct base_data *alloc_base_data(void)
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -606,8 +605,7 @@ static void *unpack_data(struct object_entry *obj,
|
||||
git_inflate_end(&stream);
|
||||
free(inbuf);
|
||||
if (consume) {
|
||||
free(data);
|
||||
data = NULL;
|
||||
FREE_AND_NULL(data);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
Reference in New Issue
Block a user