[Pkg-gnupg-commit] [gpgme] 45/132: core: Cleanup gpgme_key_unref frees

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit 8ede86795a1d419c01b4910ec2fd1fb18b629452
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 1 18:06:54 2017 +0100

    core: Cleanup gpgme_key_unref frees
    
    * src/key.c (gpgme_key_unref): Nowadays we assume free(NULL) is ok.
---
 src/key.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/key.c b/src/key.c
index e33abd0..e2e30db 100644
--- a/src/key.c
+++ b/src/key.c
@@ -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);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git