romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-14 12:13:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

code cleanup: we prefer 'CURLcode result'

Browse source 
... for the local variable name in functions holding the return
code. Using the same name universally makes code easier to read and
follow.

Also, unify code for checking for CURLcode errors with:

 if(result) or if(!result)

instead of

 if(result == CURLE_OK), if(CURLE_OK == result) or if(result != CURLE_OK)
This commit is contained in:
Daniel Stenberg 2014-10-23 22:56:35 +02:00
parent 1752e9c088
commit 0eb3d15ccb
27 changed files with 413 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/telnet.c
View file

@ -1076,7 +1076,7 @@ CURLcode telrcv(struct connectdata *conn,
CLIENTWRITE_BODY, \
(char *)&inbuf[startwrite], \
in-startwrite); \
if(result != CURLE_OK) \
if(result) \
return result; \
} \
startwrite = -1
@ -1230,9 +1230,9 @@ static CURLcode send_telnet_data(struct connectdata *conn,
unsigned char outbuf[2];
ssize_t bytes_written, total_written;
int out_count;
CURLcode rc = CURLE_OK;
CURLcode result = CURLE_OK;
while(rc == CURLE_OK && nread--) {
while(!result && nread--) {
outbuf[0] = *buffer++;
out_count = 1;
if(outbuf[0] == CURL_IAC)
@ -1247,19 +1247,20 @@ static CURLcode send_telnet_data(struct connectdata *conn,
switch (Curl_poll(pfd, 1, -1)) {
case -1: /* error, abort writing */
case 0: /* timeout (will never happen) */
rc = CURLE_SEND_ERROR;
result = CURLE_SEND_ERROR;
break;
default: /* write! */
bytes_written = 0;
rc = Curl_write(conn, conn->sock[FIRSTSOCKET], outbuf+total_written,
out_count-total_written, &bytes_written);
result = Curl_write(conn, conn->sock[FIRSTSOCKET],
outbuf+total_written, out_count-total_written,
&bytes_written);
total_written += bytes_written;
break;
}
/* handle partial write */
} while(rc == CURLE_OK && total_written < out_count);
/* handle partial write */
} while(!result && total_written < out_count);
}
return rc;
return result;
}
static CURLcode telnet_done(struct connectdata *conn,