diff options
| author | Neal H. Walfield <[email protected]> | 2015-08-28 14:22:59 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-08-31 09:30:54 +0000 |
| commit | 0377db4b3581561b1ffc5bb7c3b4d698e8993b3a (patch) | |
| tree | e25b231e263cea210c0024abbb2d302c8156d7e5 | |
| parent | agent: Fix SSH public key for EdDSA. (diff) | |
| download | gnupg-0377db4b3581561b1ffc5bb7c3b4d698e8993b3a.tar.gz gnupg-0377db4b3581561b1ffc5bb7c3b4d698e8993b3a.zip | |
g10: Remove unused parameter.
* g10/keydb.h (keydb_locate_writable): Remove unused parameter
reserved. Update users.
--
Signed-off-by: Neal H. Walfield <[email protected]>.
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 2 | ||||
| -rw-r--r-- | g10/keydb.c | 4 | ||||
| -rw-r--r-- | g10/keydb.h | 2 | ||||
| -rw-r--r-- | g10/keygen.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/g10/import.c b/g10/import.c index 60a037bdf..048b136c9 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1073,7 +1073,7 @@ import_one (ctrl_t ctrl, { KEYDB_HANDLE hd = keydb_new (); - rc = keydb_locate_writable (hd, NULL); + rc = keydb_locate_writable (hd); if (rc) { log_error (_("no writable keyring found: %s\n"), gpg_strerror (rc)); diff --git a/g10/keydb.c b/g10/keydb.c index 1446c07b7..c97687132 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1439,12 +1439,10 @@ keydb_delete_keyblock (KEYDB_HANDLE hd) * resource. */ gpg_error_t -keydb_locate_writable (KEYDB_HANDLE hd, const char *reserved) +keydb_locate_writable (KEYDB_HANDLE hd) { gpg_error_t rc; - (void)reserved; - if (!hd) return GPG_ERR_INV_ARG; diff --git a/g10/keydb.h b/g10/keydb.h index 727c96f85..10864509c 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -145,7 +145,7 @@ gpg_error_t keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb); gpg_error_t keydb_update_keyblock (KEYDB_HANDLE hd, kbnode_t kb); gpg_error_t keydb_insert_keyblock (KEYDB_HANDLE hd, kbnode_t kb); gpg_error_t keydb_delete_keyblock (KEYDB_HANDLE hd); -gpg_error_t keydb_locate_writable (KEYDB_HANDLE hd, const char *reserved); +gpg_error_t keydb_locate_writable (KEYDB_HANDLE hd); void keydb_rebuild_caches (int noisy); unsigned long keydb_get_skipped_counter (KEYDB_HANDLE hd); gpg_error_t keydb_search_reset (KEYDB_HANDLE hd); diff --git a/g10/keygen.c b/g10/keygen.c index f03c148cf..dd3755978 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -4146,7 +4146,7 @@ do_generate_keypair (struct para_data_s *para, { KEYDB_HANDLE pub_hd = keydb_new (); - err = keydb_locate_writable (pub_hd, NULL); + err = keydb_locate_writable (pub_hd); if (err) log_error (_("no writable public keyring found: %s\n"), gpg_strerror (err)); |