bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation error on clang

Browse source 
This also lead me to notice that in _alpm_gpgme_checksig many things
were not being cleaned up.  Fix this by having CHECK_ERR goto gpg_error
and make the required adjustments.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2013-02-10 11:08:36 +10:00
parent 572b1a5de7
commit bafee395a6
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/libalpm/signing.c
View file

@ -37,7 +37,7 @@
#if HAVE_LIBGPGME #if HAVE_LIBGPGME
#define CHECK_ERR(void) do { \ #define CHECK_ERR(void) do { \
if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto error; } \ if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { goto gpg_error; } \
} while(0) } while(0)
/** /**
@ -174,7 +174,7 @@ static int init_gpgme(alpm_handle_t *handle)
init = 1; init = 1;
return 0; return 0;
error: gpg_error:
_alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); _alpm_log(handle, ALPM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err));
RET_ERR(handle, ALPM_ERR_GPGME, -1); RET_ERR(handle, ALPM_ERR_GPGME, -1);
} }
@ -215,8 +215,10 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr)
} }
gpgme_key_unref(key); gpgme_key_unref(key);
error: gpg_error:
gpgme_release(ctx); gpgme_release(ctx);
error:
return ret; return ret;
} }
@ -279,9 +281,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
} }
} }
if(gpg_err_code(err) != GPG_ERR_NO_ERROR) { CHECK_ERR();
goto error;
}
/* should only get here if key actually exists */ /* should only get here if key actually exists */
pgpkey->data = key; pgpkey->data = key;
@ -319,7 +319,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
ret = 1; ret = 1;
error: gpg_error:
if(ret != 1) { if(ret != 1) {
_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err)); _alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
} }
@ -371,7 +371,7 @@ static int key_import(alpm_handle_t *handle, alpm_pgpkey_t *key)
ret = 0; ret = 0;
} }
error: gpg_error:
gpgme_release(ctx); gpgme_release(ctx);
return ret; return ret;
} }