g10: Remove unused parameter.

* g10/keydb.h (keydb_locate_writable): Remove unused parameter
reserved.  Update users.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-28 16:22:59 +02:00
parent 135b1e32f0
commit 0377db4b35
4 changed files with 4 additions and 6 deletions

View File

@ -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));

View File

@ -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;

View File

@ -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);

View File

@ -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));