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

Yet another curl_off_t printf format attempt, we now exclude the %-letter from

Browse source 
FORMAT_OFF_T to allow additional options to get specified, like with '"%5"
FORMAT_OFF_T'.
This commit is contained in:
Daniel Stenberg 2004-03-02 09:31:18 +00:00
parent 9f437269fb
commit 353f764119
7 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/http.c
View file

@ -1272,7 +1272,7 @@ CURLcode Curl_http(struct connectdata *conn)
passed += actuallyread;
if(actuallyread != readthisamountnow) {
failf(data, "Could only read " FORMAT_OFF_T
failf(data, "Could only read %" FORMAT_OFF_T
" bytes from the input",
passed);
return CURLE_READ_ERROR;
@ -1312,8 +1312,8 @@ CURLcode Curl_http(struct connectdata *conn)
curl_off_t total_expected_size=
conn->resume_from + data->set.infilesize;
conn->allocptr.rangeline =
aprintf("Content-Range: bytes %s" FORMAT_OFF_T "/"
FORMAT_OFF_T "\r\n",
aprintf("Content-Range: bytes %s%" FORMAT_OFF_T
"/%" FORMAT_OFF_T "\r\n",
conn->range, total_expected_size-1,
total_expected_size);
}
@ -1321,7 +1321,7 @@ CURLcode Curl_http(struct connectdata *conn)
/* Range was selected and then we just pass the incoming range and
append total size */
conn->allocptr.rangeline =
aprintf("Content-Range: bytes %s/" FORMAT_OFF_T "\r\n",
aprintf("Content-Range: bytes %s/%" FORMAT_OFF_T "\r\n",
conn->range, data->set.infilesize);
}
}
@ -1551,7 +1551,7 @@ CURLcode Curl_http(struct connectdata *conn)
if((data->set.infilesize>0) && !conn->bits.upload_chunky)
/* only add Content-Length if not uploading chunked */
add_bufferf(req_buffer,
"Content-Length: " FORMAT_OFF_T "\r\n", /* size */
"Content-Length: %" FORMAT_OFF_T "\r\n", /* size */
data->set.infilesize );
add_bufferf(req_buffer, "\r\n");