summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/signing.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-12 15:57:26 +0200
committerDan McGee <dan@archlinux.org>2012-04-12 15:57:26 +0200
commitd7b728591ad68712be2c0ade7c2dd8e45bc2dfed (patch)
tree679076addb5e80513151236151c4735e75cdee48 /lib/libalpm/signing.c
parent6a8e50a69ec419cc95ee513cd2e73944c4ac57f9 (diff)
parentded66fbb62cdad37d577dc048e37f7cea7f7a4da (diff)
downloadpacman-d7b728591ad68712be2c0ade7c2dd8e45bc2dfed.tar.gz
pacman-d7b728591ad68712be2c0ade7c2dd8e45bc2dfed.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/signing.c')
-rw-r--r--lib/libalpm/signing.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 018b1cca..1e417164 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -208,9 +208,9 @@ static int key_in_keychain(alpm_handle_t *handle, const char *fpr)
} else {
_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
}
+ gpgme_key_unref(key);
error:
- gpgme_key_unref(key);
gpgme_release(ctx);
return ret;
}
@@ -812,7 +812,7 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
_("%s: key \"%s\" is unknown\n"), identifier, name);
#ifdef HAVE_LIBGPGME
{
- int answer;
+ int answer = 0;
alpm_pgpkey_t fetch_key;
memset(&fetch_key, 0, sizeof(fetch_key));