moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

gtls: Use preferred 'CURLcode result'

Browse Source
This commit is contained in:
Steve Holme 2014-12-24 17:26:21 +00:00
parent a89ec793d0
commit 8830df8b66
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/vtls/gtls.c
View File

@ -1151,12 +1151,12 @@ Curl_gtls_connect(struct connectdata *conn,
int sockindex) int sockindex)
{ {
CURLcode retcode; CURLcode result;
bool done = FALSE; bool done = FALSE;
retcode = gtls_connect_common(conn, sockindex, FALSE, &done); result = gtls_connect_common(conn, sockindex, FALSE, &done);
if(retcode) if(result)
return retcode; return result;
DEBUGASSERT(done); DEBUGASSERT(done);
@ -1304,10 +1304,10 @@ static ssize_t gtls_recv(struct connectdata *conn, /* connection data */
if(ret == GNUTLS_E_REHANDSHAKE) { if(ret == GNUTLS_E_REHANDSHAKE) {
/* BLOCKING call, this is bad but a work-around for now. Fixing this "the /* BLOCKING call, this is bad but a work-around for now. Fixing this "the
proper way" takes a whole lot of work. */ proper way" takes a whole lot of work. */
CURLcode rc = handshake(conn, num, FALSE, FALSE); CURLcode result = handshake(conn, num, FALSE, FALSE);
if(rc) if(result)
/* handshake() writes error message on its own */ /* handshake() writes error message on its own */
*curlcode = rc; *curlcode = result;
else else
*curlcode = CURLE_AGAIN; /* then return as if this was a wouldblock */ *curlcode = CURLE_AGAIN; /* then return as if this was a wouldblock */
return -1; return -1;