security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Switch to the libgpg-error provided estream.

Browse source 
* 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.
This commit is contained in:
Werner Koch 2014-08-26 17:47:22 +02:00
parent a731c22952
commit 519305feb8
38 changed files with 93 additions and 7134 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/xasprintf.c
View file

@ -32,15 +32,14 @@
#include <errno.h>
#include "util.h"
#include "iobuf.h"
#if !defined(_ESTREAM_PRINTF_REALLOC)
#error Need to define _ESTREAM_PRINTF_REALLOC
#endif
/* Same as asprintf but return an allocated buffer suitable to be
freed using xfree. This function simply dies on memory failure,
thus no extra check is required. */
thus no extra check is required.
FIXME: We should remove these functions in favor of gpgrt_bsprintf
and a xgpgrt_bsprintf or rename them to xbsprintf and
xtrybsprintf. */
char *
xasprintf (const char *fmt, ...)
{
@ -48,7 +47,7 @@ xasprintf (const char *fmt, ...)
char *buf;
va_start (ap, fmt);
if (estream_vasprintf (&buf, fmt, ap) < 0)
if (gpgrt_vasprintf (&buf, fmt, ap) < 0)
log_fatal ("estream_asprintf failed: %s\n", strerror (errno));
va_end (ap);
return buf;
@ -63,7 +62,7 @@ xtryasprintf (const char *fmt, ...)
char *buf;
va_start (ap, fmt);
rc = estream_vasprintf (&buf, fmt, ap);
rc = gpgrt_vasprintf (&buf, fmt, ap);
va_end (ap);
if (rc < 0)
return NULL;