moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

indent: some whitespace edits

Browse Source
This commit is contained in:
Daniel Stenberg 2010-05-27 21:03:46 +02:00
parent 4a0493f789
commit 63661d8e83
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/transfer.c
View File

@ -194,7 +194,8 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
/* \n will become \r\n later on */ /* \n will become \r\n later on */
endofline_native = "\n"; endofline_native = "\n";
endofline_network = "\x0a"; endofline_network = "\x0a";
} else { }
else {
endofline_native = "\r\n"; endofline_native = "\r\n";
endofline_network = "\x0d\x0a"; endofline_network = "\x0d\x0a";
} }
@ -219,21 +220,20 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
if(data->set.prefer_ascii) { if(data->set.prefer_ascii) {
/* translate the protocol and data */ /* translate the protocol and data */
length = nread; length = nread;
} else { }
else {
/* just translate the protocol portion */ /* just translate the protocol portion */
length = strlen(hexbuffer); length = strlen(hexbuffer);
} }
res = Curl_convert_to_network(data, data->req.upload_fromhere, length); res = Curl_convert_to_network(data, data->req.upload_fromhere, length);
/* Curl_convert_to_network calls failf if unsuccessful */ /* Curl_convert_to_network calls failf if unsuccessful */
if(res != CURLE_OK) { if(res)
return(res); return(res);
}
#endif /* CURL_DOES_CONVERSIONS */ #endif /* CURL_DOES_CONVERSIONS */
if((nread - hexlen) == 0) { if((nread - hexlen) == 0)
/* mark this as done once this chunk is transfered */ /* mark this as done once this chunk is transfered */
data->req.upload_done = TRUE; data->req.upload_done = TRUE;
}
nread+=(int)strlen(endofline_native); /* for the added end of line */ nread+=(int)strlen(endofline_native); /* for the added end of line */
} }
@ -340,11 +340,11 @@ static void read_rewind(struct connectdata *conn,
show = CURLMIN(conn->buf_len - conn->read_pos, sizeof(buf)-1); show = CURLMIN(conn->buf_len - conn->read_pos, sizeof(buf)-1);
if(conn->master_buffer) { if(conn->master_buffer) {
memcpy(buf, conn->master_buffer + conn->read_pos, show); memcpy(buf, conn->master_buffer + conn->read_pos, show);
buf[show] = '\0'; buf[show] = '\0';
} }
else { else {
buf[0] = '\0'; buf[0] = '\0';
} }
DEBUGF(infof(conn->data, DEBUGF(infof(conn->data,
@ -619,22 +619,22 @@ static CURLcode readwrite_data(struct SessionHandle *data,
/* The 'excess' amount below can't be more than BUFSIZE which /* The 'excess' amount below can't be more than BUFSIZE which
always will fit in a size_t */ always will fit in a size_t */
infof(data, infof(data,
"Rewinding stream by : %zu" "Rewinding stream by : %zu"
" bytes on url %s (size = %" FORMAT_OFF_T " bytes on url %s (size = %" FORMAT_OFF_T
", maxdownload = %" FORMAT_OFF_T ", maxdownload = %" FORMAT_OFF_T
", bytecount = %" FORMAT_OFF_T ", nread = %zd)\n", ", bytecount = %" FORMAT_OFF_T ", nread = %zd)\n",
excess, data->state.path, excess, data->state.path,
k->size, k->maxdownload, k->bytecount, nread); k->size, k->maxdownload, k->bytecount, nread);
read_rewind(conn, excess); read_rewind(conn, excess);
} }
else { else {
infof(data, infof(data,
"Excess found in a non pipelined read:" "Excess found in a non pipelined read:"
" excess = %zu" " excess = %zu"
", size = %" FORMAT_OFF_T ", size = %" FORMAT_OFF_T
", maxdownload = %" FORMAT_OFF_T ", maxdownload = %" FORMAT_OFF_T
", bytecount = %" FORMAT_OFF_T "\n", ", bytecount = %" FORMAT_OFF_T "\n",
excess, k->size, k->maxdownload, k->bytecount); excess, k->size, k->maxdownload, k->bytecount);
} }
} }
@ -1063,7 +1063,8 @@ CURLcode Curl_readwrite(struct connectdata *conn,
failf(data, "Operation timed out after %ld milliseconds with %" failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received", FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",
Curl_tvdiff(k->now, k->start), k->bytecount, k->size); Curl_tvdiff(k->now, k->start), k->bytecount, k->size);
} else { }
else {
failf(data, "Operation timed out after %ld milliseconds with %" failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " bytes received", FORMAT_OFF_T " bytes received",
Curl_tvdiff(k->now, k->start), k->bytecount); Curl_tvdiff(k->now, k->start), k->bytecount);
@ -1221,7 +1222,7 @@ long Curl_sleep_time(curl_off_t rate_bps, curl_off_t cur_rate_bps,
*/ */
if(rv > 0x7fffffff) if(rv > 0x7fffffff)
rv = 0x7fffffff; rv = 0x7fffffff;
return (long)rv; return (long)rv;
} }