From 6714d41af5b3f4d447eb0caea0ede38b753397f8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 22 Aug 2014 15:12:57 +0200 Subject: First set of changes to include estream into the API. * configure.ac (AH_BOTTOM): Define GPGRT_ENABLE_ES_MACROS. * src/gpg-error.h.in: include stdio.h. Include most of the estream functions and rename structures and types. * src/estream.h: Rewrite. Include only gpg-error.h and local prototypes. * src/estream.c: Rename types and macros. * src/estream-printf.c (_gpgrt_estream_snprintf): Prefix public functions with _gpgrt_. --- src/estream-printf.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/estream-printf.h') diff --git a/src/estream-printf.h b/src/estream-printf.h index ca8ad8a..aabda9d 100644 --- a/src/estream-printf.h +++ b/src/estream-printf.h @@ -123,23 +123,23 @@ extern "C" typedef int (*estream_printf_out_t) (void *outfncarg, const char *buf, size_t buflen); -int estream_format (estream_printf_out_t outfnc, void *outfncarg, - const char *format, va_list vaargs) +int _gpgrt_estream_format (estream_printf_out_t outfnc, void *outfncarg, + const char *format, va_list vaargs) _ESTREAM_GCC_A_PRINTF(3,0); -int estream_printf (const char *format, ...) +int _gpgrt_estream_printf (const char *format, ...) _ESTREAM_GCC_A_PRINTF(1,2); -int estream_fprintf (FILE *fp, const char *format, ... ) +int _gpgrt_estream_fprintf (FILE *fp, const char *format, ... ) _ESTREAM_GCC_A_PRINTF(2,3); -int estream_vfprintf (FILE *fp, const char *format, va_list arg_ptr) +int _gpgrt_estream_vfprintf (FILE *fp, const char *format, va_list arg_ptr) _ESTREAM_GCC_A_PRINTF(2,0); -int estream_snprintf (char *buf, size_t bufsize, const char *format, ...) +int _gpgrt_estream_snprintf (char *buf, size_t bufsize, const char *format, ...) _ESTREAM_GCC_A_PRINTF(3,4); -int estream_vsnprintf (char *buf,size_t bufsize, +int _gpgrt_estream_vsnprintf (char *buf,size_t bufsize, const char *format, va_list arg_ptr) _ESTREAM_GCC_A_PRINTF(3,0); -int estream_asprintf (char **bufp, const char *format, ...) +int _gpgrt_estream_asprintf (char **bufp, const char *format, ...) _ESTREAM_GCC_A_PRINTF(2,3); -int estream_vasprintf (char **bufp, const char *format, va_list arg_ptr) +int _gpgrt_estream_vasprintf (char **bufp, const char *format, va_list arg_ptr) _ESTREAM_GCC_A_PRINTF(2,0); -- cgit v1.2.1