Avoid incompatible pointer assignment warnings on Windows.

* common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
* dirmngr/server.c (data_line_cookie_write): Ditto.
* sm/certdump.c (format_name_writer): Ditto.
* sm/server.c (data_line_cookie_write): Ditto.
* dirmngr/http.c (cookie_read, cookie_write): Ditto.
--

See the release notes of libgpg-error 1.15 for background info on
gpgrt_ssize_t.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-11-27 18:30:14 +01:00
parent 100f34e869
commit 64e8708339
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
5 changed files with 21 additions and 20 deletions

View File

@ -195,7 +195,7 @@ parse_portno (const char *str, unsigned short *r_port)
} }
static ssize_t static gpgrt_ssize_t
fun_writer (void *cookie_arg, const void *buffer, size_t size) fun_writer (void *cookie_arg, const void *buffer, size_t size)
{ {
struct fun_cookie_s *cookie = cookie_arg; struct fun_cookie_s *cookie = cookie_arg;
@ -391,11 +391,11 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size)
DWORD nwritten; DWORD nwritten;
WriteFile ((HANDLE)cookie->fd, buffer, size, &nwritten, NULL); WriteFile ((HANDLE)cookie->fd, buffer, size, &nwritten, NULL);
return (ssize_t)size; /* Okay. */ return (gpgrt_ssize_t)size; /* Okay. */
} }
#endif #endif
if (!writen (cookie->fd, buffer, size, cookie->is_socket)) if (!writen (cookie->fd, buffer, size, cookie->is_socket))
return (ssize_t)size; /* Okay. */ return (gpgrt_ssize_t)size; /* Okay. */
} }
if (!running_detached && cookie->fd != -1 if (!running_detached && cookie->fd != -1
@ -415,7 +415,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size)
log_socket = -1; log_socket = -1;
} }
return (ssize_t)size; return (gpgrt_ssize_t)size;
} }

View File

@ -169,8 +169,9 @@ static assuan_fd_t connect_server (const char *server, unsigned short port,
int *r_host_not_found); int *r_host_not_found);
static gpg_error_t write_server (int sock, const char *data, size_t length); static gpg_error_t write_server (int sock, const char *data, size_t length);
static ssize_t cookie_read (void *cookie, void *buffer, size_t size); static gpgrt_ssize_t cookie_read (void *cookie, void *buffer, size_t size);
static ssize_t cookie_write (void *cookie, const void *buffer, size_t size); static gpgrt_ssize_t cookie_write (void *cookie,
const void *buffer, size_t size);
static int cookie_close (void *cookie); static int cookie_close (void *cookie);
@ -2415,7 +2416,7 @@ write_server (int sock, const char *data, size_t length)
/* Read handler for estream. */ /* Read handler for estream. */
static ssize_t static gpgrt_ssize_t
cookie_read (void *cookie, void *buffer, size_t size) cookie_read (void *cookie, void *buffer, size_t size)
{ {
cookie_t c = cookie; cookie_t c = cookie;
@ -2497,11 +2498,11 @@ cookie_read (void *cookie, void *buffer, size_t size)
c->content_length = 0; c->content_length = 0;
} }
return nread; return (gpgrt_ssize_t)nread;
} }
/* Write handler for estream. */ /* Write handler for estream. */
static ssize_t static gpgrt_ssize_t
cookie_write (void *cookie, const void *buffer_arg, size_t size) cookie_write (void *cookie, const void *buffer_arg, size_t size)
{ {
const char *buffer = buffer_arg; const char *buffer = buffer_arg;
@ -2550,7 +2551,7 @@ cookie_write (void *cookie, const void *buffer_arg, size_t size)
nwritten = size; nwritten = size;
} }
return nwritten; return (gpgrt_ssize_t)nwritten;
} }

View File

@ -95,8 +95,8 @@ struct server_local_s
/* Cookie definition for assuan data line output. */ /* Cookie definition for assuan data line output. */
static ssize_t data_line_cookie_write (void *cookie, static gpgrt_ssize_t data_line_cookie_write (void *cookie,
const void *buffer, size_t size); const void *buffer, size_t size);
static int data_line_cookie_close (void *cookie); static int data_line_cookie_close (void *cookie);
static es_cookie_io_functions_t data_line_cookie_functions = static es_cookie_io_functions_t data_line_cookie_functions =
{ {
@ -210,14 +210,14 @@ data_line_write (assuan_context_t ctx, const void *buffer_arg, size_t size)
/* A write handler used by es_fopencookie to write assuan data /* A write handler used by es_fopencookie to write assuan data
lines. */ lines. */
static ssize_t static gpgrt_ssize_t
data_line_cookie_write (void *cookie, const void *buffer, size_t size) data_line_cookie_write (void *cookie, const void *buffer, size_t size)
{ {
assuan_context_t ctx = cookie; assuan_context_t ctx = cookie;
if (data_line_write (ctx, buffer, size)) if (data_line_write (ctx, buffer, size))
return -1; return -1;
return (ssize_t)size; return (gpgrt_ssize_t)size;
} }

View File

@ -652,7 +652,7 @@ struct format_name_cookie
}; };
/* The writer function for the memory stream. */ /* The writer function for the memory stream. */
static ssize_t static gpgrt_ssize_t
format_name_writer (void *cookie, const void *buffer, size_t size) format_name_writer (void *cookie, const void *buffer, size_t size)
{ {
struct format_name_cookie *c = cookie; struct format_name_cookie *c = cookie;
@ -696,7 +696,7 @@ format_name_writer (void *cookie, const void *buffer, size_t size)
c->len += size; c->len += size;
p[c->len] = 0; /* Terminate string. */ p[c->len] = 0; /* Terminate string. */
return (ssize_t)size; return (gpgrt_ssize_t)size;
} }

View File

@ -55,8 +55,8 @@ struct server_local_s {
/* Cookie definition for assuan data line output. */ /* Cookie definition for assuan data line output. */
static ssize_t data_line_cookie_write (void *cookie, static gpgrt_ssize_t data_line_cookie_write (void *cookie,
const void *buffer, size_t size); const void *buffer, size_t size);
static int data_line_cookie_close (void *cookie); static int data_line_cookie_close (void *cookie);
static es_cookie_io_functions_t data_line_cookie_functions = static es_cookie_io_functions_t data_line_cookie_functions =
{ {
@ -129,7 +129,7 @@ has_option (const char *line, const char *name)
/* A write handler used by es_fopencookie to write assuan data /* A write handler used by es_fopencookie to write assuan data
lines. */ lines. */
static ssize_t static gpgrt_ssize_t
data_line_cookie_write (void *cookie, const void *buffer, size_t size) data_line_cookie_write (void *cookie, const void *buffer, size_t size)
{ {
assuan_context_t ctx = cookie; assuan_context_t ctx = cookie;
@ -140,7 +140,7 @@ data_line_cookie_write (void *cookie, const void *buffer, size_t size)
return -1; return -1;
} }
return size; return (gpgrt_ssize_t)size;
} }
static int static int