From e1dfd862367cf91b66abe86bd73664409354bb14 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 16 Feb 2017 17:11:38 +0100 Subject: common: Rename remaining symbols in ksba-io-support. * common/ksba-io-support.c (gpgsm_reader_eof_seen): Rename to ... (gnupg_ksba_reader_eof_seen): this. Change all callers. (gpgsm_destroy_reader): Rename to ... (gnupg_ksba_destroy_reader): this. Change all callers. (gpgsm_finish_writer): Rename to ... (gnupg_ksba_finish_writer): this. Change all callers. (gpgsm_destroy_writer): Rename to ... (gnupg_ksba_destroy_writer): this. Change all callers. * common/ksba-io-support.c (struct base64_context_s): Rename to ... (gnupg_ksba_io_s): this. * common/ksba-io-support.h (base64_context_s): Ditto. (Base64Context): Rename this typedef to ... (gnupg_ksba_io_t): this. Change all users. Signed-off-by: Werner Koch --- sm/encrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sm/encrypt.c') diff --git a/sm/encrypt.c b/sm/encrypt.c index 468f78503..3a7d4bb18 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -299,7 +299,7 @@ int gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp) { int rc = 0; - Base64Context b64writer = NULL; + gnupg_ksba_io_t b64writer = NULL; gpg_error_t err; ksba_writer_t writer; ksba_reader_t reader = NULL; @@ -502,7 +502,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp) } - rc = gpgsm_finish_writer (b64writer); + rc = gnupg_ksba_finish_writer (b64writer); if (rc) { log_error ("write failed: %s\n", gpg_strerror (rc)); @@ -513,7 +513,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp) leave: ksba_cms_release (cms); - gpgsm_destroy_writer (b64writer); + gnupg_ksba_destroy_writer (b64writer); ksba_reader_release (reader); keydb_release (kh); xfree (dek); -- cgit v1.2.3