aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-04-21 13:23:04 +0000
committerJustus Winter <[email protected]>2016-04-21 13:35:37 +0000
commitb8cb0973bcbe201a1e32a326dd97c3e72778b9d8 (patch)
treea10c3a974d357d861d05df81ae5bc615ce2242db
parentcommon: Add support for the new extended private key format. (diff)
downloadgnupg-b8cb0973bcbe201a1e32a326dd97c3e72778b9d8.tar.gz
gnupg-b8cb0973bcbe201a1e32a326dd97c3e72778b9d8.zip
common: Drop unused variables, fix warnings.
-- Signed-off-by: Justus Winter <[email protected]>
-rw-r--r--common/private-keys.c2
-rw-r--r--common/t-private-keys.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/common/private-keys.c b/common/private-keys.c
index d77ce1643..a3c06f9cf 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 06415a1fa..1027e70cf 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;