diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-06-15 23:15:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-16 19:44:03 (GMT) |
| commit | 6a83d902073803c4141e02c53decf8c03e35da27 (patch) | |
| tree | 209cf1639a325875240fce3e1f1cabbdb25878df /fast-import.c | |
| parent | cf9f49ea4817b36e93e64909a918a912cc32c28b (diff) | |
| download | git-6a83d902073803c4141e02c53decf8c03e35da27.zip git-6a83d902073803c4141e02c53decf8c03e35da27.tar.gz git-6a83d902073803c4141e02c53decf8c03e35da27.tar.bz2 | |
coccinelle: make use of the "type" FREE_AND_NULL() rule
Apply the result of the just-added coccinelle rule. 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>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fast-import.c b/fast-import.c index 9a22fc9..eeab927 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1063,8 +1063,7 @@ discard_pack: close(pack_data->pack_fd); unlink_or_warn(pack_data->pack_name); } - free(pack_data); - pack_data = NULL; + FREE_AND_NULL(pack_data); running = 0; /* We can't carry a delta across packfiles. */ @@ -1149,8 +1148,7 @@ static int store_object( /* We cannot carry a delta into the new pack. */ if (delta) { - free(delta); - delta = NULL; + FREE_AND_NULL(delta); git_deflate_init(&s, pack_compression_level); s.next_in = (void *)dat->buf; |