security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Avoid incompatible pointer assignment warnings on Windows.

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

13
dirmngr/http.c
View file

@ -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;
}