diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 23:28:41 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 23:28:41 +0200 |
commit | 50f03c6676ed5ea040dd53272882d3aac2ee1b48 (patch) | |
tree | 8bf9680918762ffa077832674da9cca98c8c1888 /gpg-interface.c | |
parent | Merge branch 'jk/warn-add-gitlink' (diff) | |
parent | *.[ch] refactoring: make use of the FREE_AND_NULL() macro (diff) | |
download | git-50f03c6676ed5ea040dd53272882d3aac2ee1b48.tar.xz git-50f03c6676ed5ea040dd53272882d3aac2ee1b48.zip |
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
Diffstat (limited to 'gpg-interface.c')
-rw-r--r-- | gpg-interface.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index 8ab32df457..d936f3a32f 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -14,16 +14,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 { |