From 64e87083394d38998feab359caac917bcc6139d3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 27 Nov 2015 18:30:14 +0100 Subject: 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 --- sm/certdump.c | 4 ++-- sm/server.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sm') diff --git a/sm/certdump.c b/sm/certdump.c index f32a27cc5..0cc492af4 100644 --- a/sm/certdump.c +++ b/sm/certdump.c @@ -652,7 +652,7 @@ struct format_name_cookie }; /* 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) { struct format_name_cookie *c = cookie; @@ -696,7 +696,7 @@ format_name_writer (void *cookie, const void *buffer, size_t size) c->len += size; p[c->len] = 0; /* Terminate string. */ - return (ssize_t)size; + return (gpgrt_ssize_t)size; } diff --git a/sm/server.c b/sm/server.c index e47861b43..f0512efac 100644 --- a/sm/server.c +++ b/sm/server.c @@ -55,8 +55,8 @@ struct server_local_s { /* Cookie definition for assuan data line output. */ -static ssize_t data_line_cookie_write (void *cookie, - const void *buffer, size_t size); +static gpgrt_ssize_t data_line_cookie_write (void *cookie, + const void *buffer, size_t size); static int data_line_cookie_close (void *cookie); 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 lines. */ -static ssize_t +static gpgrt_ssize_t data_line_cookie_write (void *cookie, const void *buffer, size_t size) { assuan_context_t ctx = cookie; @@ -140,7 +140,7 @@ data_line_cookie_write (void *cookie, const void *buffer, size_t size) return -1; } - return size; + return (gpgrt_ssize_t)size; } static int -- cgit v1.2.3