diff options
| author | Werner Koch <[email protected]> | 2018-08-28 13:11:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-08-28 13:16:19 +0000 |
| commit | db67ccb759426c1173761574b14bdfe6a76394c2 (patch) | |
| tree | 151e370543b0255114ce01532b7db15c77b774bb | |
| parent | gpg: Prepare for longer card fingerprints. (diff) | |
| download | gnupg-db67ccb759426c1173761574b14bdfe6a76394c2.tar.gz gnupg-db67ccb759426c1173761574b14bdfe6a76394c2.zip | |
gpg: Remove unused arg from a function.
* g10/getkey.c (get_best_pubkey_byname): Remove unused arg 'no_akl'.
Change both callers.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | g10/getkey.c | 4 | ||||
| -rw-r--r-- | g10/keydb.h | 2 | ||||
| -rw-r--r-- | g10/keylist.c | 2 | ||||
| -rw-r--r-- | g10/pkclist.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 41afeb9e8..b0ee10e4d 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1636,7 +1636,7 @@ pubkey_cmp (ctrl_t ctrl, const char *name, struct pubkey_cmp_cookie *old, gpg_error_t get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk, const char *name, KBNODE *ret_keyblock, - int include_unusable, int no_akl) + int include_unusable) { gpg_error_t err; 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; err = get_pubkey_byname (ctrl, &ctx, pk, name, ret_keyblock, - NULL, include_unusable, no_akl); + NULL, include_unusable, 0); if (err) { getkey_end (ctrl, ctx); diff --git a/g10/keydb.h b/g10/keydb.h index 9748e571e..5ab0d5814 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -368,7 +368,7 @@ int get_pubkey_byname (ctrl_t ctrl, gpg_error_t get_best_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *retctx, PKT_public_key *pk, const char *name, KBNODE *ret_keyblock, - int include_unusable, int no_akl); + int include_unusable); /* Get a public key directly from file FNAME. */ gpg_error_t get_pubkey_fromfile (ctrl_t ctrl, diff --git a/g10/keylist.c b/g10/keylist.c index 39b87e49f..8b7da76ee 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -653,7 +653,7 @@ locate_one (ctrl_t ctrl, strlist_t names) 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 (gpg_err_code (rc) != GPG_ERR_NO_PUBKEY) diff --git a/g10/pkclist.c b/g10/pkclist.c index e7484432a..46258bf85 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -834,7 +834,7 @@ find_and_check_key (ctrl_t ctrl, const char *name, unsigned int use, if (from_file) rc = get_pubkey_fromfile (ctrl, pk, name); 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) { int code; |