diff options
author | Werner Koch <[email protected]> | 2015-11-27 17:30:14 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-11-27 17:32:17 +0000 |
commit | 64e87083394d38998feab359caac917bcc6139d3 (patch) | |
tree | 58d04f4cf93c71ae252cc53d2fc416bb288962fe /common/logging.c | |
parent | dirmngr: Avoid a declarations after statements. (diff) | |
download | gnupg-64e87083394d38998feab359caac917bcc6139d3.tar.gz gnupg-64e87083394d38998feab359caac917bcc6139d3.zip |
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 <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | common/logging.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/logging.c b/common/logging.c index 54b8c8960..b7f141920 100644 --- a/common/logging.c +++ b/common/logging.c @@ -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) { struct fun_cookie_s *cookie = cookie_arg; @@ -391,11 +391,11 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) DWORD nwritten; WriteFile ((HANDLE)cookie->fd, buffer, size, &nwritten, NULL); - return (ssize_t)size; /* Okay. */ + return (gpgrt_ssize_t)size; /* Okay. */ } #endif 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 @@ -415,7 +415,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) log_socket = -1; } - return (ssize_t)size; + return (gpgrt_ssize_t)size; } |