From 353f7641193ddf3f6a42d49d53ea994e4ea4388b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 2 Mar 2004 09:31:18 +0000 Subject: Yet another curl_off_t printf format attempt, we now exclude the %-letter from FORMAT_OFF_T to allow additional options to get specified, like with '"%5" FORMAT_OFF_T'. --- lib/http.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/http.c') diff --git a/lib/http.c b/lib/http.c index c7e54ed89..dcb5674bc 100644 --- a/lib/http.c +++ b/lib/http.c @@ -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"); -- cgit v1.2.3