Skip to content

Commit

Permalink
Merge branch 'ab/unconditional-free-and-null'
Browse files Browse the repository at this point in the history
Code clean-up.

* ab/unconditional-free-and-null:
  refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)
  • Loading branch information
gitster committed Aug 27, 2018
2 parents a988ce9 + ce528de commit 7ae96e3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions blame.c
Expand Up @@ -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);
}

/*
Expand Down
4 changes: 1 addition & 3 deletions branch.c
Expand Up @@ -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;
}
Expand Down
4 changes: 1 addition & 3 deletions http.c
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions tree-diff.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 7ae96e3

Please sign in to comment.