moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Remove argument from check_pgp_helper

Browse Source 
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 <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-08-24 23:19:06 -05:00
parent 6aa9fdce5a
commit e1dce078b2
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libalpm/be_package.c
View File

@ -349,7 +349,8 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile,
if(level & ALPM_SIG_PACKAGE && if(level & ALPM_SIG_PACKAGE &&
_alpm_check_pgp_helper(handle, pkgfile, base64_sig, _alpm_check_pgp_helper(handle, pkgfile, base64_sig,
level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK, 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); _alpm_pkg_free(newpkg);
return NULL; return NULL;
} }

3
lib/libalpm/be_sync.c
View File

@ -102,7 +102,8 @@ static int sync_db_validate(alpm_db_t *db)
if(level & ALPM_SIG_DATABASE) { if(level & ALPM_SIG_DATABASE) {
if(_alpm_check_pgp_helper(db->handle, dbpath, NULL, if(_alpm_check_pgp_helper(db->handle, dbpath, NULL,
level & ALPM_SIG_DATABASE_OPTIONAL, level & ALPM_SIG_DATABASE_MARGINAL_OK, 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; return 1;
} }
} }

7
lib/libalpm/signing.c
View File

@ -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, int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path,
const char *base64_sig, int optional, int marginal, int unknown, const char *base64_sig, int optional, int marginal, int unknown)
enum _alpm_errno_t invalid_err)
{ {
alpm_sigresult_t result; alpm_sigresult_t result;
int ret; int ret;
@ -496,10 +495,6 @@ int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path,
break; break;
} }
} }
if(ret) {
handle->pm_errno = invalid_err;
}
} }
alpm_sigresult_cleanup(&result); alpm_sigresult_cleanup(&result);

3
lib/libalpm/signing.h
View File

@ -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, int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
const char *base64_sig, alpm_sigresult_t *result); const char *base64_sig, alpm_sigresult_t *result);
int _alpm_check_pgp_helper(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, const char *base64_sig, int optional, int marginal, int unknown);
enum _alpm_errno_t invalid_err);
#endif /* _ALPM_SIGNING_H */ #endif /* _ALPM_SIGNING_H */