summaryrefslogtreecommitdiff
path: root/gpg-interface.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-06-15 23:15:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-16 19:44:09 (GMT)
commit88ce3ef636b1385e861ec0e9e2155248b999b032 (patch)
tree0da315e544f734755c717c04852b2c44ac3345d3 /gpg-interface.c
parente140f7afddcdce2bae062ea1578eac38c744e3a5 (diff)
downloadgit-88ce3ef636b1385e861ec0e9e2155248b999b032.zip
git-88ce3ef636b1385e861ec0e9e2155248b999b032.tar.gz
git-88ce3ef636b1385e861ec0e9e2155248b999b032.tar.bz2
*.[ch] refactoring: make use of the FREE_AND_NULL() macro
Replace occurrences of `free(ptr); ptr = NULL` which weren't caught by the coccinelle rule. These fall into two categories: - free/NULL assignments one after the other which coccinelle all put on one line, which is functionally equivalent code, but very ugly. - manually spotted occurrences where the NULL assignment isn't right after the free() call. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gpg-interface.c')
-rw-r--r--gpg-interface.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/gpg-interface.c b/gpg-interface.c
index e44cc27..3f377f8 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -13,16 +13,11 @@ static const char *gpg_program = "gpg";
void signature_check_clear(struct signature_check *sigc)
{
- free(sigc->payload);
- free(sigc->gpg_output);
- free(sigc->gpg_status);
- free(sigc->signer);
- free(sigc->key);
- sigc->payload = NULL;
- sigc->gpg_output = NULL;
- sigc->gpg_status = NULL;
- sigc->signer = NULL;
- sigc->key = NULL;
+ FREE_AND_NULL(sigc->payload);
+ FREE_AND_NULL(sigc->gpg_output);
+ FREE_AND_NULL(sigc->gpg_status);
+ FREE_AND_NULL(sigc->signer);
+ FREE_AND_NULL(sigc->key);
}
static struct {