diff options
| author | Werner Koch <[email protected]> | 2014-08-26 15:47:22 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-26 15:47:54 +0000 |
| commit | 519305feb888b529c005b40445d041a088a2f8fc (patch) | |
| tree | 74994a5b568e059982ca83a0daa8b7d96035355d /dirmngr/crlcache.c | |
| parent | gpg: Allow for positional parameters in the passphrase prompt. (diff) | |
| download | gnupg-519305feb888b529c005b40445d041a088a2f8fc.tar.gz gnupg-519305feb888b529c005b40445d041a088a2f8fc.zip | |
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.
Diffstat (limited to 'dirmngr/crlcache.c')
| -rw-r--r-- | dirmngr/crlcache.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c index 8505f9c40..d10e3ca78 100644 --- a/dirmngr/crlcache.c +++ b/dirmngr/crlcache.c @@ -113,7 +113,6 @@ #include "crlfetch.h" #include "misc.h" #include "cdb.h" -#include "estream-printf.h" /* Change this whenever the format changes */ #define DBDIR_D (opt.system_daemon? "crls.d" : "dirmngr-cache.d") @@ -818,8 +817,8 @@ update_dir (crl_cache_t cache) nodename = utsbuf.nodename; #endif - estream_asprintf (&tmpbuf, "DIR-tmp-%s-%u-%p.txt.tmp", - nodename, (unsigned int)getpid (), &tmpbuf); + gpgrt_asprintf (&tmpbuf, "DIR-tmp-%s-%u-%p.txt.tmp", + nodename, (unsigned int)getpid (), &tmpbuf); if (!tmpbuf) { err = gpg_error_from_errno (errno); @@ -2022,8 +2021,8 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader) nodename = utsbuf.nodename; #endif - estream_asprintf (&tmpfname, "crl-tmp-%s-%u-%p.db.tmp", - nodename, (unsigned int)getpid (), &tmpfname); + gpgrt_asprintf (&tmpfname, "crl-tmp-%s-%u-%p.db.tmp", + nodename, (unsigned int)getpid (), &tmpfname); if (!tmpfname) { err = gpg_error_from_syserror (); |