From 0039d7107bcdfce6f3b02b46ff0495cfba07882a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 1 Apr 2017 11:10:47 +0200 Subject: 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 --- kbx/keybox-defs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kbx/keybox-defs.h') 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 --*/ -- cgit v1.2.3