diff options
| author | Werner Koch <[email protected]> | 2017-02-16 16:11:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-02-16 16:21:05 +0000 |
| commit | e1dfd862367cf91b66abe86bd73664409354bb14 (patch) | |
| tree | e1aa37db9e4f3d3e84b5d1be359f09cc92cf800f /sm/import.c | |
| parent | common: Remove gpgsm dependencies from ksba-io-support. (diff) | |
| download | gnupg-e1dfd862367cf91b66abe86bd73664409354bb14.tar.gz gnupg-e1dfd862367cf91b66abe86bd73664409354bb14.zip | |
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 <[email protected]>
Diffstat (limited to 'sm/import.c')
| -rw-r--r-- | sm/import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sm/import.c b/sm/import.c index 2a0710891..b284b5125 100644 --- a/sm/import.c +++ b/sm/import.c @@ -272,7 +272,7 @@ static int import_one (ctrl_t ctrl, struct stats_s *stats, int in_fd) { int rc; - Base64Context b64reader = NULL; + gnupg_ksba_io_t b64reader = NULL; ksba_reader_t reader; ksba_cert_t cert = NULL; ksba_cms_t cms = NULL; @@ -380,14 +380,14 @@ import_one (ctrl_t ctrl, struct stats_s *stats, int in_fd) ksba_reader_clear (reader, NULL, NULL); } - while (!gpgsm_reader_eof_seen (b64reader)); + while (!gnupg_ksba_reader_eof_seen (b64reader)); leave: if (any && gpg_err_code (rc) == GPG_ERR_EOF) rc = 0; ksba_cms_release (cms); ksba_cert_release (cert); - gpgsm_destroy_reader (b64reader); + gnupg_ksba_destroy_reader (b64reader); es_fclose (fp); return rc; } |