From c7ca0f73dbe7c080b79f93f90f00ba2396fc4bd0 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 13 Jan 2016 15:08:42 +0100 Subject: kbx: Change return type of search functions to gpg_error_t. * kbx/keybox-search.c (keybox_search_reset): Change return type to gpg_error_t. (keybox_search): Ditto. Also handle GPG_ERR_EOF. * sm/keydb.c (keydb_search_reset): Ditto. Signed-off-by: Werner Koch --- kbx/keybox-search.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kbx/keybox-search.c') diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index 1edb4ae38..681d5c0e1 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -732,7 +732,7 @@ release_sn_array (struct sn_array_s *array, size_t size) */ -int +gpg_error_t keybox_search_reset (KEYBOX_HANDLE hd) { if (!hd) @@ -760,12 +760,12 @@ keybox_search_reset (KEYBOX_HANDLE hd) If WANT_BLOBTYPE is not 0 only blobs of this type are considered. The value at R_SKIPPED is updated by the number of skipped long records (counts PGP and X.509). */ -int +gpg_error_t keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, keybox_blobtype_t want_blobtype, size_t *r_descindex, unsigned long *r_skipped) { - int rc; + gpg_error_t rc; size_t n; int need_words, any_skip; KEYBOXBLOB blob = NULL; @@ -1021,7 +1021,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc, hd->found.pk_no = pk_no; hd->found.uid_no = uid_no; } - else if (rc == -1) + else if (rc == -1 || gpg_err_code (rc) == GPG_ERR_EOF) { _keybox_release_blob (blob); hd->eof = 1; -- cgit v1.2.3