aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/http.c7
-rw-r--r--lib/http_chunks.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/http.c b/lib/http.c
index 068748c3c..b6609c818 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1836,13 +1836,10 @@ static CURLcode https_connecting(struct connectdata *conn, bool *done)
/* perform SSL initialization for this socket */
result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, done);
- if(result) {
+ if(result)
conn->bits.close = TRUE; /* a failed connection is marked for closure
to prevent (bad) re-use or similar */
- return result;
- }
-
- return CURLE_OK;
+ return result;
}
#ifdef USE_SSLEAY
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index e0887483a..630a5a265 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -85,9 +85,9 @@
We avoid the use of isxdigit to accommodate non-ASCII hosts. */
static bool Curl_isxdigit(char digit)
{
- return (digit >= 0x30 && digit <= 0x39) /* 0-9 */
- || (digit >= 0x41 && digit <= 0x46) /* A-F */
- || (digit >= 0x61 && digit <= 0x66); /* a-f */
+ return (bool)( (digit >= 0x30 && digit <= 0x39) /* 0-9 */
+ || (digit >= 0x41 && digit <= 0x46) /* A-F */
+ || (digit >= 0x61 && digit <= 0x66) ); /* a-f */
}
void Curl_httpchunk_init(struct connectdata *conn)