security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

gpg: Remove unused arg from a function.

Browse Source 
* g10/getkey.c (get_best_pubkey_byname): Remove unused arg 'no_akl'.
Change both callers.

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit db67ccb759426c1173761574b14bdfe6a76394c2)
This commit is contained in:
Werner Koch 2018-08-28 15:11:10 +02:00
parent 0786ac7842
commit 11a9fe1c58
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/getkey.c
View File

@ -1636,7 +1636,7 @@ pubkey_cmp (ctrl_t ctrl, const char *name, struct pubkey_cmp_cookie *old,
gpg_error_t gpg_error_t
get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk, get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
const char *name, KBNODE *ret_keyblock, const char *name, KBNODE *ret_keyblock,
int include_unusable, int no_akl) int include_unusable)
{ {
gpg_error_t err; gpg_error_t err;
struct getkey_ctx_s *ctx = NULL; struct getkey_ctx_s *ctx = NULL;
@ -1645,7 +1645,7 @@ get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk,
*retctx = NULL; *retctx = NULL;
err = get_pubkey_byname (ctrl, &ctx, pk, name, ret_keyblock, err = get_pubkey_byname (ctrl, &ctx, pk, name, ret_keyblock,
NULL, include_unusable, no_akl); NULL, include_unusable, 0);
if (err) if (err)
{ {
getkey_end (ctrl, ctx); getkey_end (ctrl, ctx);

2
g10/keydb.h
View File

@ -367,7 +367,7 @@ int get_pubkey_byname (ctrl_t ctrl,
gpg_error_t get_best_pubkey_byname (ctrl_t ctrl, gpg_error_t get_best_pubkey_byname (ctrl_t ctrl,
GETKEY_CTX *retctx, PKT_public_key *pk, GETKEY_CTX *retctx, PKT_public_key *pk,
const char *name, KBNODE *ret_keyblock, const char *name, KBNODE *ret_keyblock,
int include_unusable, int no_akl); int include_unusable);
/* Get a public key directly from file FNAME. */ /* Get a public key directly from file FNAME. */
gpg_error_t get_pubkey_fromfile (ctrl_t ctrl, gpg_error_t get_pubkey_fromfile (ctrl_t ctrl,

2
g10/keylist.c
View File

@ -652,7 +652,7 @@ locate_one (ctrl_t ctrl, strlist_t names)
for (sl = names; sl; sl = sl->next) for (sl = names; sl; sl = sl->next)
{ {
rc = get_best_pubkey_byname (ctrl, &ctx, NULL, sl->d, &keyblock, 1, 0); rc = get_best_pubkey_byname (ctrl, &ctx, NULL, sl->d, &keyblock, 1);
if (rc) if (rc)
{ {
if (gpg_err_code (rc) != GPG_ERR_NO_PUBKEY) if (gpg_err_code (rc) != GPG_ERR_NO_PUBKEY)

2
g10/pkclist.c
View File

@ -834,7 +834,7 @@ find_and_check_key (ctrl_t ctrl, const char *name, unsigned int use,
if (from_file) if (from_file)
rc = get_pubkey_fromfile (ctrl, pk, name); rc = get_pubkey_fromfile (ctrl, pk, name);
else else
rc = get_best_pubkey_byname (ctrl, NULL, pk, name, &keyblock, 0, 0); rc = get_best_pubkey_byname (ctrl, NULL, pk, name, &keyblock, 0);
if (rc) if (rc)
{ {
int code; int code;