aboutsummaryrefslogtreecommitdiffstats
path: root/src/assuan-socket-connect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/assuan-socket-connect.c')
-rw-r--r--src/assuan-socket-connect.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 1151215..c77586d 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -55,12 +55,12 @@
static int
do_finish (assuan_context_t ctx)
{
- if (ctx->inbound.fd != -1)
+ if (ctx->inbound.fd != ASSUAN_INVALID_FD)
{
_assuan_close (ctx->inbound.fd);
}
- ctx->inbound.fd = -1;
- ctx->outbound.fd = -1;
+ ctx->inbound.fd = ASSUAN_INVALID_FD;
+ ctx->outbound.fd = ASSUAN_INVALID_FD;
return 0;
}
@@ -96,7 +96,7 @@ assuan_socket_connect_ext (assuan_context_t *r_ctx,
assuan_error_t err;
assuan_context_t ctx;
- int fd;
+ assuan_fd_t fd;
struct sockaddr_un srvr_addr;
size_t len;
const char *s;
@@ -124,7 +124,7 @@ assuan_socket_connect_ext (assuan_context_t *r_ctx,
ctx->finish_handler = do_finish;
fd = _assuan_sock_new (PF_LOCAL, SOCK_STREAM, 0);
- if (fd == -1)
+ if (fd == ASSUAN_INVALID_FD)
{
_assuan_log_printf ("can't create socket: %s\n", strerror (errno));
_assuan_release_context (ctx);
@@ -138,7 +138,7 @@ assuan_socket_connect_ext (assuan_context_t *r_ctx,
len = SUN_LEN (&srvr_addr);
- if (_assuan_sock_connect (fd, (struct sockaddr *) &srvr_addr, len) == -1)
+ if ( _assuan_sock_connect (fd, (struct sockaddr *) &srvr_addr, len) == -1 )
{
_assuan_log_printf ("can't connect to `%s': %s\n",
name, strerror (errno));