diff options
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/crlcache.c | 9 | ||||
| -rw-r--r-- | dirmngr/crlfetch.c | 1 | ||||
| -rw-r--r-- | dirmngr/dirmngr_ldap.c | 1 | ||||
| -rw-r--r-- | dirmngr/ks-action.c | 2 | ||||
| -rw-r--r-- | dirmngr/ks-engine.h | 3 | ||||
| -rw-r--r-- | dirmngr/ocsp.c | 1 |
6 files changed, 7 insertions, 10 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 (); diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c index c682d1856..f335de8c7 100644 --- a/dirmngr/crlfetch.c +++ b/dirmngr/crlfetch.c @@ -29,7 +29,6 @@ #include "misc.h" #include "http.h" -#include "estream.h" #include "ldap-wrapper.h" diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index 7d3bd1794..daa2d1bcb 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -50,6 +50,7 @@ #define JNLIB_NEED_LOG_LOGV +#include <gpg-error.h> #include "../common/logging.h" #include "../common/argparse.h" #include "../common/stringhelp.h" diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c index 495f7fa93..e4cd8f165 100644 --- a/dirmngr/ks-action.c +++ b/dirmngr/ks-action.c @@ -67,7 +67,7 @@ ks_printf_help (ctrl_t ctrl, const char *format, ...) char *buf; va_start (arg_ptr, format); - buf = es_vasprintf (format, arg_ptr); + buf = es_vbsprintf (format, arg_ptr); err = buf? 0 : gpg_error_from_syserror (); va_end (arg_ptr); if (!err) diff --git a/dirmngr/ks-engine.h b/dirmngr/ks-engine.h index a2faa751a..dc950cf3c 100644 --- a/dirmngr/ks-engine.h +++ b/dirmngr/ks-engine.h @@ -20,13 +20,12 @@ #ifndef DIRMNGR_KS_ENGINE_H #define DIRMNGR_KS_ENGINE_H 1 -#include "../common/estream.h" #include "../common/http.h" /*-- ks-action.c --*/ gpg_error_t ks_print_help (ctrl_t ctrl, const char *text); gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format, - ...) _ESTREAM_GCC_A_PRINTF(2,3); + ...) JNLIB_GCC_A_PRINTF(2,3); /*-- ks-engine-hkp.c --*/ gpg_error_t ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri); diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c index 0d506efcd..f8c437d1d 100644 --- a/dirmngr/ocsp.c +++ b/dirmngr/ocsp.c @@ -30,7 +30,6 @@ #include "validate.h" #include "certcache.h" #include "ocsp.h" -#include "estream.h" /* The maximum size we allow as a response from an OCSP reponder. */ #define MAX_RESPONSE_SIZE 65536 |