diff options
author | Andre Heinecke <aheinecke@intevation.de> | 2017-02-01 18:06:54 +0100 |
---|---|---|
committer | Andre Heinecke <aheinecke@intevation.de> | 2017-02-01 18:06:54 +0100 |
commit | 8ede86795a1d419c01b4910ec2fd1fb18b629452 (patch) | |
tree | 6e75c28269f9525f4debdf41faf688df68d8b80c /src/key.c | |
parent | b5075030bec9b21bf4e515bc1686df3fa43eced2 (diff) | |
download | gpgme-8ede86795a1d419c01b4910ec2fd1fb18b629452.tar.gz |
core: Cleanup gpgme_key_unref frees
* src/key.c (gpgme_key_unref): Nowadays we assume free(NULL) is ok.
Diffstat (limited to 'src/key.c')
-rw-r--r-- | src/key.c | 25 |
1 files changed, 8 insertions, 17 deletions
@@ -341,14 +341,10 @@ gpgme_key_unref (gpgme_key_t key) while (subkey) { gpgme_subkey_t next = subkey->next; - if (subkey->fpr) - free (subkey->fpr); - if (subkey->curve) - free (subkey->curve); - if (subkey->keygrip) - free (subkey->keygrip); - if (subkey->card_number) - free (subkey->card_number); + free (subkey->fpr); + free (subkey->curve); + free (subkey->keygrip); + free (subkey->card_number); free (subkey); subkey = next; } @@ -393,15 +389,10 @@ gpgme_key_unref (gpgme_key_t key) uid = next_uid; } - if (key->issuer_serial) - free (key->issuer_serial); - if (key->issuer_name) - free (key->issuer_name); - - if (key->chain_id) - free (key->chain_id); - if (key->fpr) - free (key->fpr); + free (key->issuer_serial); + free (key->issuer_name); + free (key->chain_id); + free (key->fpr); free (key); } |