mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Fix format string errors and some missing error case initialization.
* common/logging.c (do_logv): Remove extra parentheses in comparison. * dirmngr/dns-stuff.c (resolve_addr_libdns): Init RES so that dns_res_close is given a defined value in the error case. * dirmngr/http.c (cookie_read, cookie_write) [HTTP_USE_NTBTLS]: Fix format string char. * dirmngr/ks-engine-hkp.c (ks_hkp_help): Remove duplicate "const". * dirmngr/ks-engine-http.c (ks_http_help): Ditto. * dirmngr/ks-engine-kdns.c (ks_kdns_help): Ditto. * dirmngr/ks-engine-ldap.c (ks_ldap_help): Ditto. * scd/app-p15.c (send_keypairinfo, do_getattr): Fix format string char. * tools/gpgconf-comp.c (gpg_agent_runtime_change): Init PID for the error case. (scdaemon_runtime_change): Ditto. (dirmngr_runtime_change): Ditto. * tools/gpgconf.c (query_swdb): Init VALUE_SIZE_UL. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
3ca3da8fc4
commit
af5979a42b
10 changed files with 14 additions and 14 deletions
|
@ -947,7 +947,7 @@ resolve_addr_libdns (const struct sockaddr *addr, int addrlen,
|
|||
{
|
||||
gpg_error_t err;
|
||||
char host[DNS_D_MAXNAME + 1];
|
||||
struct dns_resolver *res;
|
||||
struct dns_resolver *res = NULL;
|
||||
struct dns_packet *ans = NULL;
|
||||
struct dns_ptr ptr;
|
||||
int derr;
|
||||
|
|
|
@ -2707,7 +2707,7 @@ cookie_read (void *cookie, void *buffer, size_t size)
|
|||
ntbtls_get_stream (c->session->tls_session, &in, &out);
|
||||
nread = es_fread (buffer, 1, size, in);
|
||||
if (opt_debug)
|
||||
log_debug ("TLS network read: %d/%u\n", nread, size);
|
||||
log_debug ("TLS network read: %d/%zu\n", nread, size);
|
||||
}
|
||||
else
|
||||
#elif HTTP_USE_GNUTLS
|
||||
|
@ -2800,7 +2800,7 @@ cookie_write (void *cookie, const void *buffer_arg, size_t size)
|
|||
else
|
||||
nwritten = es_fwrite (buffer, 1, size, out);
|
||||
if (opt_debug)
|
||||
log_debug ("TLS network write: %d/%u\n", nwritten, size);
|
||||
log_debug ("TLS network write: %d/%zu\n", nwritten, size);
|
||||
}
|
||||
else
|
||||
#elif HTTP_USE_GNUTLS
|
||||
|
|
|
@ -851,7 +851,7 @@ ks_hkp_print_hosttable (ctrl_t ctrl)
|
|||
gpg_error_t
|
||||
ks_hkp_help (ctrl_t ctrl, parsed_uri_t uri)
|
||||
{
|
||||
const char const data[] =
|
||||
const char data[] =
|
||||
"Handler for HKP URLs:\n"
|
||||
" hkp://\n"
|
||||
#if HTTP_USE_GNUTLS || HTTP_USE_NTBTLS
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
gpg_error_t
|
||||
ks_http_help (ctrl_t ctrl, parsed_uri_t uri)
|
||||
{
|
||||
const char const data[] =
|
||||
const char data[] =
|
||||
"Handler for HTTP URLs:\n"
|
||||
" http://\n"
|
||||
#if HTTP_USE_GNUTLS || HTTP_USE_NTBTLS
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
gpg_error_t
|
||||
ks_kdns_help (ctrl_t ctrl, parsed_uri_t uri)
|
||||
{
|
||||
const char const data[] =
|
||||
const char data[] =
|
||||
"This keyserver engine accepts URLs of the form:\n"
|
||||
" kdns://[NAMESERVER]/[ROOT][?at=STRING]\n"
|
||||
"with\n"
|
||||
|
|
|
@ -289,7 +289,7 @@ epoch2ldaptime (time_t stamp)
|
|||
gpg_error_t
|
||||
ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri)
|
||||
{
|
||||
const char const data[] =
|
||||
const char data[] =
|
||||
"Handler for LDAP URLs:\n"
|
||||
" ldap://host:port/[BASEDN]???[bindname=BINDNAME,password=PASSWORD]\n"
|
||||
"\n"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue