From e1dce078b247142f7db80bf2d338e431df34691e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 24 Aug 2011 23:19:06 -0500 Subject: Remove argument from check_pgp_helper This one wasn't all that necessary as we only used it in one place in the function, which can be checked easily enough at the call site. Signed-off-by: Dan McGee --- lib/libalpm/be_package.c | 3 ++- lib/libalpm/be_sync.c | 3 ++- lib/libalpm/signing.c | 7 +------ lib/libalpm/signing.h | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 80287542..deec0c45 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -349,7 +349,8 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, if(level & ALPM_SIG_PACKAGE && _alpm_check_pgp_helper(handle, pkgfile, base64_sig, level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK, - level & ALPM_SIG_PACKAGE_UNKNOWN_OK, ALPM_ERR_PKG_INVALID_SIG)) { + level & ALPM_SIG_PACKAGE_UNKNOWN_OK)) { + handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; _alpm_pkg_free(newpkg); return NULL; } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 6e64e5ff..d7c0a749 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -102,7 +102,8 @@ static int sync_db_validate(alpm_db_t *db) if(level & ALPM_SIG_DATABASE) { if(_alpm_check_pgp_helper(db->handle, dbpath, NULL, level & ALPM_SIG_DATABASE_OPTIONAL, level & ALPM_SIG_DATABASE_MARGINAL_OK, - level & ALPM_SIG_DATABASE_UNKNOWN_OK, ALPM_ERR_DB_INVALID_SIG)) { + level & ALPM_SIG_DATABASE_UNKNOWN_OK)) { + db->handle->pm_errno = ALPM_ERR_DB_INVALID_SIG; return 1; } } diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 4428b543..8db4a7b2 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -437,8 +437,7 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path) } int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, - const char *base64_sig, int optional, int marginal, int unknown, - enum _alpm_errno_t invalid_err) + const char *base64_sig, int optional, int marginal, int unknown) { alpm_sigresult_t result; int ret; @@ -496,10 +495,6 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, break; } } - - if(ret) { - handle->pm_errno = invalid_err; - } } alpm_sigresult_cleanup(&result); diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index d07057a2..3c98a482 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -25,8 +25,7 @@ char *_alpm_sigpath(alpm_handle_t *handle, const char *path); int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, const char *base64_sig, alpm_sigresult_t *result); int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, - const char *base64_sig, int optional, int marginal, int unknown, - enum _alpm_errno_t invalid_err); + const char *base64_sig, int optional, int marginal, int unknown); #endif /* _ALPM_SIGNING_H */ -- cgit v1.2.3-24-g4f1b