From 398688ca2ec1614d31d67bdf91534d66bd511d8f Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Mon, 23 Jan 2012 10:22:36 +0000 Subject: [PATCH] Use update_error instead of set_error where could be called more than once. --- emi.canl.canl-c/src/canl.c | 6 +++--- emi.canl.canl-c/src/canl_ssl.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emi.canl.canl-c/src/canl.c b/emi.canl.canl-c/src/canl.c index 774542a..4458f57 100644 --- a/emi.canl.canl-c/src/canl.c +++ b/emi.canl.canl-c/src/canl.c @@ -222,20 +222,20 @@ static int try_connect(glb_ctx *glb_cc, io_handler *io_cc, char *addr, a_len = sizeof (struct sockaddr_in6); break; default: - return set_error(glb_cc, EINVAL, POSIX_ERROR, + return update_error(glb_cc, EINVAL, POSIX_ERROR, "Unsupported address type (%d)", addrtype); break; } sock = socket(a.ss_family, SOCK_STREAM, 0); if (sock == -1) - return set_error(glb_cc, errno, POSIX_ERROR, + return update_error(glb_cc, errno, POSIX_ERROR, "Failed to create network socket"); err = connect(sock,(struct sockaddr *) &a, a_len); /* XXX timeouts missing */ if (err) { - return set_error(glb_cc, errno, POSIX_ERROR, + return update_error(glb_cc, errno, POSIX_ERROR, "Failed to open network connection"); } diff --git a/emi.canl.canl-c/src/canl_ssl.c b/emi.canl.canl-c/src/canl_ssl.c index 9e36c91..d4eb29c 100644 --- a/emi.canl.canl-c/src/canl_ssl.c +++ b/emi.canl.canl-c/src/canl_ssl.c @@ -464,16 +464,16 @@ static int do_ssl_connect(glb_ctx *cc, io_handler *io, timeout->tv_sec=0; timeout->tv_usec=0; err = ETIMEDOUT; - set_error (cc, err, POSIX_ERROR, "Connection stuck during" + update_error (cc, err, POSIX_ERROR, "Connection stuck during" " handshake: timeout reached"); } else if (ret2 < 0) - return set_error(cc, ssl_err, e_orig, "Error during SSL handshake"); + return update_error(cc, ssl_err, e_orig, "Error during SSL handshake"); else if (ret2 == 0)//TODO is 0 (conn closed by the other side) error? - set_error (cc, 0, SSL_ERROR, "Connection closed" + update_error (cc, 0, SSL_ERROR, "Connection closed" " by the other side"); else - set_error (cc, err, UNKNOWN_ERROR, "Error during SSL handshake"); + update_error (cc, err, UNKNOWN_ERROR, "Error during SSL handshake"); return 1; } return 0; -- 1.8.2.3