mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 12:16:10 +02:00
Code

Merge branch 'ab/unconditional-free-and-null' 

Code clean-up.

* ab/unconditional-free-and-null:
  refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)
This commit is contained in:
Junio C Hamano 2018-08-27 14:33:42 -07:00
parent a988ce9a58 ce528de023
commit 7ae96e3fcf
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blame.c
View File

@ -337,9 +337,7 @@ static void fill_origin_blob(struct diff_options *opt,
static void drop_origin_blob(struct blame_origin *o)
{
if (o->file.ptr) {
FREE_AND_NULL(o->file.ptr);
}
FREE_AND_NULL(o->file.ptr);
}
/*

4
branch.c
View File

@ -25,9 +25,7 @@ static int find_tracked_branch(struct remote *remote, void *priv)
tracking->remote = remote->name;
} else {
free(tracking->spec.src);
if (tracking->src) {
FREE_AND_NULL(tracking->src);
}
FREE_AND_NULL(tracking->src);
}
tracking->spec.src = NULL;
}

4
http.c
View File

@ -2418,9 +2418,7 @@ void release_http_object_request(struct http_object_request *freq)
close(freq->localfile);
freq->localfile = -1;
}
if (freq->url != NULL) {
FREE_AND_NULL(freq->url);
}
FREE_AND_NULL(freq->url);
if (freq->slot != NULL) {
freq->slot->callback_func = NULL;
freq->slot->callback_data = NULL;

4
tree-diff.c
View File

@ -557,9 +557,7 @@ struct combine_diff_path *diff_tree_paths(
* free pre-allocated last element, if any
* (see path_appendnew() for details about why)
*/
if (p->next) {
FREE_AND_NULL(p->next);
}
FREE_AND_NULL(p->next);
return p;
}