[Pkg-gnupg-commit] [gnupg2] 149/205: common: Drop unused variables, fix warnings.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit b8cb0973bcbe201a1e32a326dd97c3e72778b9d8
Author: Justus Winter <justus at g10code.com>
Date:   Thu Apr 21 15:23:04 2016 +0200

    common: Drop unused variables, fix warnings.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 common/private-keys.c   | 2 +-
 common/t-private-keys.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/private-keys.c b/common/private-keys.c
index d77ce16..a3c06f9 100644
--- a/common/private-keys.c
+++ b/common/private-keys.c
@@ -347,7 +347,7 @@ _pkc_add (pkc_t pk, char *name, char *value, strlist_t raw_value,
     {
       pke_t last;
 
-      if (preserve_order)
+      if (preserve_order || name == NULL)
 	last = pk->last;
       else
 	{
diff --git a/common/t-private-keys.c b/common/t-private-keys.c
index 06415a1..1027e70 100644
--- a/common/t-private-keys.c
+++ b/common/t-private-keys.c
@@ -269,7 +269,6 @@ run_modification_tests (void)
 {
   gpg_error_t err;
   pkc_t pk;
-  pke_t e;
   gcry_sexp_t key;
   char *buf;
 
@@ -380,7 +379,6 @@ convert (const char *fname)
   gcry_sexp_t key;
   char *buf;
   size_t buflen;
-  gpgrt_ssize_t nread;
   struct stat st;
   pkc_t pk;
 

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