diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/assuan-pipe-server.c | 2 | ||||
| -rw-r--r-- | src/assuan-socket.c | 1 | ||||
| -rw-r--r-- | src/assuan.h | 24 |
4 files changed, 23 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e84c344..ce14714 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-11-24 Marcus Brinkmann <[email protected]> + + * assuan.h (struct _assuan_peercred) [_WIN32]: Define dummy member + so struct is not empty. + * assuan-socket.c (assuan_sock_deinit): Set sock_ctx to NULL. + 2009-11-19 Marcus Brinkmann <[email protected]> * Makefile.am (common_sources): Remove assuan-connect.c and add diff --git a/src/assuan-pipe-server.c b/src/assuan-pipe-server.c index 56c3947..f195697 100644 --- a/src/assuan-pipe-server.c +++ b/src/assuan-pipe-server.c @@ -48,6 +48,8 @@ is_valid_socket (const char *s) #endif /*!HAVE_W32_SYSTEM*/ +/* This actually is a int file descriptor (and not assuan_fd_t) as + _get_osfhandle is called on W32 systems. */ gpg_error_t assuan_init_pipe_server (assuan_context_t ctx, int filedes[2]) { diff --git a/src/assuan-socket.c b/src/assuan-socket.c index a6ee7a4..83ea9dd 100644 --- a/src/assuan-socket.c +++ b/src/assuan-socket.c @@ -426,6 +426,7 @@ assuan_sock_deinit () #endif assuan_release (sock_ctx); + sock_ctx = NULL; } diff --git a/src/assuan.h b/src/assuan.h index 7552257..33afc63 100644 --- a/src/assuan.h +++ b/src/assuan.h @@ -337,7 +337,7 @@ const char *assuan_get_command_name (assuan_context_t ctx); FILE *assuan_get_data_fp (assuan_context_t ctx); gpg_error_t assuan_set_okay_line (assuan_context_t ctx, const char *line); gpg_error_t assuan_write_status (assuan_context_t ctx, - const char *keyword, const char *text); + const char *keyword, const char *text); /* Negotiate a file descriptor. If LINE contains "FD=N", returns N assuming a local file descriptor. If LINE contains "FD" reads a @@ -388,7 +388,10 @@ gpg_error_t assuan_socket_connect (assuan_context_t ctx, const char *name, pid_t assuan_get_pid (assuan_context_t ctx); struct _assuan_peercred { -#ifndef _WIN32 +#ifdef _WIN32 + /* Empty struct not allowed on some compilers. */ + unsigned int _dummy; +#else pid_t pid; uid_t uid; gid_t gid; @@ -416,17 +419,17 @@ gpg_error_t assuan_inquire (assuan_context_t ctx, const char *keyword, unsigned char **r_buffer, size_t *r_length, size_t maxlen); gpg_error_t assuan_inquire_ext (assuan_context_t ctx, const char *keyword, - size_t maxlen, - gpg_error_t (*cb) (void *cb_data, - gpg_error_t rc, - unsigned char *buf, - size_t buf_len), - void *cb_data); + size_t maxlen, + gpg_error_t (*cb) (void *cb_data, + gpg_error_t rc, + unsigned char *buf, + size_t buf_len), + void *cb_data); /*-- assuan-buffer.c --*/ gpg_error_t assuan_read_line (assuan_context_t ctx, char **line, size_t *linelen); int assuan_pending_line (assuan_context_t ctx); -gpg_error_t assuan_write_line (assuan_context_t ctx, const char *line ); +gpg_error_t assuan_write_line (assuan_context_t ctx, const char *line); gpg_error_t assuan_send_data (assuan_context_t ctx, const void *buffer, size_t length); @@ -438,7 +441,8 @@ gpg_error_t assuan_receivefd (assuan_context_t ctx, assuan_fd_t *fd); /*-- assuan-util.c --*/ -gpg_error_t assuan_set_error (assuan_context_t ctx, gpg_error_t err, const char *text); +gpg_error_t assuan_set_error (assuan_context_t ctx, gpg_error_t err, + const char *text); |