From a294204163cde65bbf14be4cb0f789b0f3dc1967 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 2 Dec 2009 18:35:34 +0000 Subject: src/ 2009-12-02 Marcus Brinkmann * Makefile.am (common_sources): Remove assuan-client.c. * assuan-client.c: File removed. * assuan.h (ASSUAN_RESPONSE_ERROR, ASSUAN_RESPONSE_OK) (ASSUAN_RESPONSE_STATUS, ASSUAN_RESPONSE_INQUIRE) (ASSUAN_RESPONSE_STATUS): New macros. (assuan_response_t): New type. (assuan_client_read_response, assuan_client_parse_response): New prototypes. * libassuan.def, libassuan.vers: Add assuan_client_read_response, assuan_client_parse_response. * assuan-client.c (xtoi_1, xtoi_2, assuan_transact) (_assuan_read_from_server): Moved to ... * client.c: ... here, with updates to use new functions and types. Include . (assuan_client_read_response, assuan_client_parse_response): New functions. * assuan-defs.h (_assuan_read_from_server): Use assuan_response_t. * assuan-pipe-connect.c (initial_handshake): Use assuan_response_t and ASSUAN_RESPONSE_OK. * assuan-socket-connect.c (assuan_socket_connect): Likewise. --- src/assuan-pipe-connect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/assuan-pipe-connect.c') diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c index c1dfe94..4239459 100644 --- a/src/assuan-pipe-connect.c +++ b/src/assuan-pipe-connect.c @@ -88,14 +88,15 @@ fix_signals (void) static gpg_error_t initial_handshake (assuan_context_t ctx) { - int okay, off; + assuan_response_t response; + int off; gpg_error_t err; - err = _assuan_read_from_server (ctx, &okay, &off); + err = _assuan_read_from_server (ctx, &response, &off); if (err) TRACE1 (ctx, ASSUAN_LOG_SYSIO, "initial_handshake", ctx, "can't connect server: %s", gpg_strerror (err)); - else if (okay != 1) + else if (response != ASSUAN_RESPONSE_OK) { TRACE1 (ctx, ASSUAN_LOG_SYSIO, "initial_handshake", ctx, "can't connect server: `%s'", ctx->inbound.line); -- cgit v1.2.3