diff options
author | Yang Tse <yangsita@gmail.com> | 2008-08-15 02:58:15 +0000 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2008-08-15 02:58:15 +0000 |
commit | 66fb9ca5f6de6eb74c2c3ade7ee651a299247749 (patch) | |
tree | cfa88c9844546ba7d13375df915fe0fa4a136abc /lib/file.c | |
parent | 11cb78c5f8338e23d12cee9a1cf0a9bbc7261af2 (diff) | |
download | curl-66fb9ca5f6de6eb74c2c3ade7ee651a299247749.tar.gz |
For congruency sake with the naming of other CURL_XXXXXX_CURL_OFF_T macros,
the names of the curl_off_t formatting string directives now become
CURL_FORMAT_CURL_OFF_T and CURL_FORMAT_CURL_OFF_TU.
CURL_FMT_OFF_T -> CURL_FORMAT_CURL_OFF_T
CURL_FMT_OFF_TU -> CURL_FORMAT_CURL_OFF_TU
Remove the use of an internal name for the curl_off_t formatting string directives
and use the common one available from the inside and outside of the library.
FORMAT_OFF_T -> CURL_FORMAT_CURL_OFF_T
FORMAT_OFF_TU -> CURL_FORMAT_CURL_OFF_TU
Diffstat (limited to 'lib/file.c')
-rw-r--r-- | lib/file.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/file.c b/lib/file.c index 08d26c54a..ced1a6ca8 100644 --- a/lib/file.c +++ b/lib/file.c @@ -149,7 +149,7 @@ static CURLcode file_range(struct connectdata *conn) if((-1 == to) && (from>=0)) { /* X - */ data->state.resume_from = from; - DEBUGF(infof(data, "RANGE %" FORMAT_OFF_T " to end of file\n", + DEBUGF(infof(data, "RANGE %" CURL_FORMAT_CURL_OFF_T " to end of file\n", from)); } else if(from < 0) { @@ -157,7 +157,7 @@ static CURLcode file_range(struct connectdata *conn) totalsize = -from; data->req.maxdownload = -from; data->state.resume_from = from; - DEBUGF(infof(data, "RANGE the last %" FORMAT_OFF_T " bytes\n", + DEBUGF(infof(data, "RANGE the last %" CURL_FORMAT_CURL_OFF_T " bytes\n", totalsize)); } else { @@ -165,12 +165,13 @@ static CURLcode file_range(struct connectdata *conn) totalsize = to-from; data->req.maxdownload = totalsize+1; /* include last byte */ data->state.resume_from = from; - DEBUGF(infof(data, "RANGE from %" FORMAT_OFF_T - " getting %" FORMAT_OFF_T " bytes\n", + DEBUGF(infof(data, "RANGE from %" CURL_FORMAT_CURL_OFF_T + " getting %" CURL_FORMAT_CURL_OFF_T " bytes\n", from, data->req.maxdownload)); } - DEBUGF(infof(data, "range-download from %" FORMAT_OFF_T - " to %" FORMAT_OFF_T ", totally %" FORMAT_OFF_T " bytes\n", + DEBUGF(infof(data, "range-download from %" CURL_FORMAT_CURL_OFF_T + " to %" CURL_FORMAT_CURL_OFF_T + ", totally %" CURL_FORMAT_CURL_OFF_T " bytes\n", from, to, data->req.maxdownload)); } else @@ -460,7 +461,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) if(data->set.opt_no_body && data->set.include_header && fstated) { CURLcode result; snprintf(buf, sizeof(data->state.buffer), - "Content-Length: %" FORMAT_OFF_T "\r\n", expected_size); + "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", expected_size); result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0); if(result) return result; |