From 519305feb888b529c005b40445d041a088a2f8fc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 26 Aug 2014 17:47:22 +0200 Subject: Switch to the libgpg-error provided estream. * configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14. (GPGRT_ENABLE_ES_MACROS): Define. (estream_INIT): Remove. * m4/estream.m4: Remove. * common/estream-printf.c, common/estream-printf.h: Remove. * common/estream.c, common/estream.h: Remove. * common/init.c (_init_common_subsystems): Call gpgrt initialization. --- sm/certdump.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sm') diff --git a/sm/certdump.c b/sm/certdump.c index 21a5e292c..23cca7385 100644 --- a/sm/certdump.c +++ b/sm/certdump.c @@ -504,9 +504,8 @@ print_dn_part (FILE *fp, estream_t stream, { es_fprintf (stream, "/%s=", dn->key); if (translate) - es_write_sanitized_utf8_buffer (stream, dn->value, - strlen (dn->value), - "/", NULL); + print_utf8_buffer3 (stream, dn->value, strlen (dn->value), + "/"); else es_write_sanitized (stream, dn->value, strlen (dn->value), "/", NULL); @@ -716,8 +715,7 @@ gpgsm_es_print_name2 (estream_t fp, const char *name, int translate) if (s2) { if (translate) - es_write_sanitized_utf8_buffer (fp, s + 1, s2 - (char*)s - 1, - NULL, NULL); + print_utf8_buffer (fp, s + 1, s2 - (char*)s - 1); else es_write_sanitized (fp, s + 1, s2 - (char*)s - 1, NULL, NULL); } -- cgit v1.2.3