diff options
author | Werner Koch <[email protected]> | 2017-02-02 11:35:59 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-02-02 11:35:59 +0000 |
commit | 15050ce5fce4ed815503db7c029abb38d08970d6 (patch) | |
tree | d0c58db0e44d9f94c2655845482027b678918819 /src/util.h | |
parent | core: Remove unused check for funopen/fopencookie. (diff) | |
download | gpgme-15050ce5fce4ed815503db7c029abb38d08970d6.tar.gz gpgme-15050ce5fce4ed815503db7c029abb38d08970d6.zip |
core: Replace all calls to *sprintf by gpgrt_*sprintf.
* configure.ac (vasprintf): Remove check.
* src/vasprintf.c: Remove file.
* src/util.h (vasprintf, asprintf): Remove prototypes. Replace all
calls to vasprintf and asprintf by gpgrt_vasprintf or gpgrt_asprintf.
Also take care to use gpgrt_free on the returned value.
* src/w32-util.c (_gpgme_get_gpgconf_path): Replace a gpgrt_asprintf
by _gpgme_strconcat.
(snprintf): New macro to use gpgrt_snprintf instead of the system's
standard snprintf.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'src/util.h')
-rw-r--r-- | src/util.h | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -95,11 +95,12 @@ _gpgme_stpcpy (char *a, const char *b) #define stpcpy(a,b) _gpgme_stpcpy ((a), (b)) #endif /*!HAVE_STPCPY*/ -#if !HAVE_VASPRINTF -#include <stdarg.h> -int vasprintf (char **result, const char *format, va_list args); -int asprintf (char **result, const char *format, ...); -#endif + +/* Due to a bug in mingw32's snprintf related to the 'l' modifier and + for increased portability we use our snprintf on all systems. */ +#undef snprintf +#define snprintf gpgrt_snprintf + #if REPLACE_TTYNAME_R int _gpgme_ttyname_r (int fd, char *buf, size_t buflen); |