diff options
| author | Werner Koch <wk@gnupg.org> | 2017-04-01 11:10:47 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-04-01 11:10:47 +0200 |
| commit | 0039d7107bcdfce6f3b02b46ff0495cfba07882a (patch) | |
| tree | c68d3fb046ecc0a03e37a18b2ed54113bcb2b613 /kbx/keybox-defs.h | |
| parent | gpg: Avoid multiple open calls to the keybox file. (diff) | |
| download | gnupg2-0039d7107bcdfce6f3b02b46ff0495cfba07882a.tar.xz gnupg2-0039d7107bcdfce6f3b02b46ff0495cfba07882a.zip | |
kbx: Unify blob reading functions.
* kbx/keybox-file.c (_keybox_read_blob): Remove.
(_keybox_read_blob2): Rename to ....
(_keybox_read_blob): this. Make arg options. Change all callers.
* kbx/keybox-search.c (keybox_search): Factor fopen call out to ...
(open_file): new.
(keybox_seek): Als use open_file.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'kbx/keybox-defs.h')
| -rw-r--r-- | kbx/keybox-defs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index b8b83771a..154d4fca6 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -177,8 +177,7 @@ void _keybox_destroy_openpgp_info (keybox_openpgp_info_t info); /*-- keybox-file.c --*/ -int _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp); -int _keybox_read_blob2 (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted); +int _keybox_read_blob (KEYBOXBLOB *r_blob, FILE *fp, int *skipped_deleted); int _keybox_write_blob (KEYBOXBLOB blob, FILE *fp); /*-- keybox-search.c --*/ |