aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/http.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-11-27 17:30:14 +0000
committerWerner Koch <[email protected]>2015-11-27 17:32:17 +0000
commit64e87083394d38998feab359caac917bcc6139d3 (patch)
tree58d04f4cf93c71ae252cc53d2fc416bb288962fe /dirmngr/http.c
parentdirmngr: Avoid a declarations after statements. (diff)
downloadgnupg-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 'dirmngr/http.c')
-rw-r--r--dirmngr/http.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 02854e46d..d623f7eaa 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -169,8 +169,9 @@ static assuan_fd_t connect_server (const char *server, unsigned short port,
int *r_host_not_found);
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 ssize_t cookie_write (void *cookie, const void *buffer, size_t size);
+static gpgrt_ssize_t cookie_read (void *cookie, 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);
@@ -2415,7 +2416,7 @@ write_server (int sock, const char *data, size_t length)
/* Read handler for estream. */
-static ssize_t
+static gpgrt_ssize_t
cookie_read (void *cookie, void *buffer, size_t size)
{
cookie_t c = cookie;
@@ -2497,11 +2498,11 @@ cookie_read (void *cookie, void *buffer, size_t size)
c->content_length = 0;
}
- return nread;
+ return (gpgrt_ssize_t)nread;
}
/* Write handler for estream. */
-static ssize_t
+static gpgrt_ssize_t
cookie_write (void *cookie, const void *buffer_arg, size_t size)
{
const char *buffer = buffer_arg;
@@ -2550,7 +2551,7 @@ cookie_write (void *cookie, const void *buffer_arg, size_t size)
nwritten = size;
}
- return nwritten;
+ return (gpgrt_ssize_t)nwritten;
}