diff options
| author | Marcus Brinkmann <[email protected]> | 2009-09-01 17:19:45 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-09-01 17:19:45 +0000 |
| commit | 7389cbf6e71c402b68a9ad61afa8b113a05ea1ea (patch) | |
| tree | a3d9beea7003fd515560367c8703a5bf6a7da563 /src/assuan-socket-server.c | |
| parent | 2009-08-28 Marcus Brinkmann <[email protected]> (diff) | |
| download | libassuan-7389cbf6e71c402b68a9ad61afa8b113a05ea1ea.tar.gz libassuan-7389cbf6e71c402b68a9ad61afa8b113a05ea1ea.zip | |
doc/
2009-09-01 Marcus Brinkmann <[email protected]>
* assuan.texi: (External I/O Loop Server): Document
assuan_process_done.
(assuan_register_post_cmd_notify): Change type of ERR from int to
gpg_error_t.
(assuan_set_error): Likewise.
(assuan_register_option_handler): Change types in callback handler
from int to gpg_error_t.
(assuan_inquire_ext): Likewise.
src/
2009-09-01 Marcus Brinkmann <[email protected]>
* assuan.h: Change types in all functions from int to gpg_error_t
where relevant.
* assuan-listen.c (assuan_accept): Change type of RC from int to
gpg_error_t.
* assuan-pipe-server.c (accept_connection, finish_connection):
Change return type to gpg_error_t.
* assuan-socket-server.c (accept_connection_bottom)
(accept_connection, finish_connection): Likewise.
(assuan_init_connected_socket_server): Remove.
* assuan-defs.h (struct assuan_context_s): Change return type of
accept_handler and finish_handler to gpg_error_t.
* assuan-pipe-connect.c (do_finish): Change to void.
* assuan-inquire.c (_assuan_inquire_ext_cb): Change type of RC
from int to gpg_error_t.
* assuan-handler.c: Change return codes and RC variables from int
to gpg_error_t where appropriate.
* assuan-buffer.c (_assuan_read_line): Fix error code on EOF.
Diffstat (limited to 'src/assuan-socket-server.c')
| -rw-r--r-- | src/assuan-socket-server.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c index 67b07d1..a205b9e 100644 --- a/src/assuan-socket-server.c +++ b/src/assuan-socket-server.c @@ -44,7 +44,7 @@ static struct assuan_io io = { _assuan_simple_read, _assuan_simple_write, NULL, NULL }; -static int +static gpg_error_t accept_connection_bottom (assuan_context_t ctx) { assuan_fd_t fd = ctx->connected_fd; @@ -86,7 +86,7 @@ accept_connection_bottom (assuan_context_t ctx) } -static int +static gpg_error_t accept_connection (assuan_context_t ctx) { assuan_fd_t fd; @@ -109,7 +109,7 @@ accept_connection (assuan_context_t ctx) return accept_connection_bottom (ctx); } -static int +static gpg_error_t finish_connection (assuan_context_t ctx) { if (ctx->inbound.fd != ASSUAN_INVALID_FD) @@ -130,26 +130,18 @@ deinit_socket_server (assuan_context_t ctx) /* Initialize a server for the socket LISTEN_FD which has already be put into listen mode */ -int +gpg_error_t assuan_init_socket_server (assuan_context_t *r_ctx, assuan_fd_t listen_fd) { return assuan_init_socket_server_ext (r_ctx, listen_fd, 0); } -/* Initialize a server using the already accepted socket FD. This - function is deprecated. */ -int -assuan_init_connected_socket_server (assuan_context_t *r_ctx, assuan_fd_t fd) -{ - return assuan_init_socket_server_ext (r_ctx, fd, 2); -} - /* Flag bits: 0 - use sendmsg/recvmsg to allow descriptor passing 1 - FD has already been accepted. */ -int +gpg_error_t assuan_init_socket_server_ext (assuan_context_t *r_ctx, assuan_fd_t fd, unsigned int flags) { |