[Pkg-gnupg-commit] [gnupg2] 190/241: Avoid incompatible pointer assignment warnings on Windows.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Dec 9 20:32:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 64e87083394d38998feab359caac917bcc6139d3
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 27 18:30:14 2015 +0100
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 at gnupg.org>
---
common/logging.c | 8 ++++----
dirmngr/http.c | 13 +++++++------
dirmngr/server.c | 8 ++++----
sm/certdump.c | 4 ++--
sm/server.c | 8 ++++----
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/common/logging.c b/common/logging.c
index 54b8c89..b7f1419 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;
}
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 02854e4..d623f7e 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;
}
diff --git a/dirmngr/server.c b/dirmngr/server.c
index e08afd4..536354c 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -95,8 +95,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 =
{
@@ -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
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;
if (data_line_write (ctx, buffer, size))
return -1;
- return (ssize_t)size;
+ return (gpgrt_ssize_t)size;
}
diff --git a/sm/certdump.c b/sm/certdump.c
index f32a27c..0cc492a 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 e47861b..f0512ef 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list