gpg: Improve keydb handling in the main import function.
authorWerner Koch <wk@gnupg.org>
Wed, 18 Oct 2017 15:52:41 +0000 (17:52 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 19 Oct 2017 13:01:38 +0000 (15:01 +0200)
commit8448347b5bdee56e6f9938a93ea92fe4d3c8800c
tree50eac7f7c4231084009bb703b3921fb840ddf74b
parent752cae6dd2ee8982a34c796a3f168ae538f7938c
gpg: Improve keydb handling in the main import function.

* g10/getkey.c (get_pubkey_byfprint_fast): Factor most code out to ...
(get_keyblock_byfprint_fast): .. new function.
* g10/import.c (revocation_present): s/int rc/gpg_error_t err/.
(import_one): Use get_keyblock_byfprint_fast to get the keyblock and a
handle.  Remove the now surplus keyblock fetch in the merge branch.

Signed-off-by: Werner Koch <wk@gnupg.org>
g10/getkey.c
g10/import.c
g10/keydb.h