[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 373/411: tool_writeout: use off_t getinfo-types instead of doubl
From: |
gnunet |
Subject: |
[gnurl] 373/411: tool_writeout: use off_t getinfo-types instead of doubles |
Date: |
Wed, 13 Jan 2021 01:23:08 +0100 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit fc813f80e1bcacdb8f6e86d3f0d4263f2e5ad856
Author: Daniel Stenberg <daniel@haxx.se>
AuthorDate: Wed Nov 25 15:06:56 2020 +0100
tool_writeout: use off_t getinfo-types instead of doubles
Commit 3b80d3ca46b12e52342 (June 2017) introduced getinfo replacement
variables that use curl_off_t instead of doubles. Switch the --write-out
function over to use them.
Closes #6248
---
src/tool_writeout.c | 59 ++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 30 deletions(-)
diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 0642b6f78..c12738c43 100644
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -112,7 +112,7 @@ void ourWriteOut(CURL *curl, struct per_transfer *per,
const char *writeinfo)
const char *ptr = writeinfo;
char *stringp = NULL;
long longinfo;
- double doubleinfo;
+ curl_off_t offinfo;
while(ptr && *ptr) {
if('%' == *ptr && ptr[1]) {
@@ -189,65 +189,64 @@ void ourWriteOut(CURL *curl, struct per_transfer *per,
const char *writeinfo)
break;
case VAR_REDIRECT_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME,
- &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME_T, &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_TOTAL_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME_T, &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_NAMELOOKUP_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME,
- &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_CONNECT_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME_T, &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_APPCONNECT_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME,
- &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_PRETRANSFER_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME,
- &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_STARTTRANSFER_TIME:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME,
- &doubleinfo))
- fprintf(stream, "%.6f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_SIZE_UPLOAD:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &doubleinfo))
- fprintf(stream, "%.0f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD_T, &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_SIZE_DOWNLOAD:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD,
- &doubleinfo))
- fprintf(stream, "%.0f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_SPEED_DOWNLOAD:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD,
- &doubleinfo))
- fprintf(stream, "%.3f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD_T,
+ &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_SPEED_UPLOAD:
if(CURLE_OK ==
- curl_easy_getinfo(curl, CURLINFO_SPEED_UPLOAD, &doubleinfo))
- fprintf(stream, "%.3f", doubleinfo);
+ curl_easy_getinfo(curl, CURLINFO_SPEED_UPLOAD_T, &offinfo))
+ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo);
break;
case VAR_CONTENT_TYPE:
if((CURLE_OK ==
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnurl] 380/411: ngtcp2: use the minimal version of QUIC supported by ngtcp2, (continued)
- [gnurl] 380/411: ngtcp2: use the minimal version of QUIC supported by ngtcp2, gnunet, 2021/01/12
- [gnurl] 409/411: gnurl: rename new files, gnunet, 2021/01/12
- [gnurl] 379/411: ngtcp2: advertise h3 ALPN unconditionally, gnunet, 2021/01/12
- [gnurl] 386/411: splay: rename Curl_splayremovebyaddr to Curl_splayremove, gnunet, 2021/01/12
- [gnurl] 392/411: tests/util.py: fix compatibility with Python 2, gnunet, 2021/01/12
- [gnurl] 399/411: urlapi: don't accept blank port number field without scheme, gnunet, 2021/01/12
- [gnurl] 410/411: adjust makefile for opts, gnunet, 2021/01/12
- [gnurl] 366/411: urldata: remove 'void *protop' and create the union 'p', gnunet, 2021/01/12
- [gnurl] 344/411: cirrus: build with FreeBSD 12.2 in CirrusCI, gnunet, 2021/01/12
- [gnurl] 313/411: copyright: fix year ranges, gnunet, 2021/01/12
- [gnurl] 373/411: tool_writeout: use off_t getinfo-types instead of doubles,
gnunet <=
- [gnurl] 341/411: RELEASE-NOTES: synced, gnunet, 2021/01/12
- [gnurl] 304/411: rtsp: fixed Session ID comparison to refuse prefix, gnunet, 2021/01/12
- [gnurl] 350/411: KNOWN_BUGS: cmake build doesn't fail if zlib not found, gnunet, 2021/01/12
- [gnurl] 323/411: FAQ: remove "Why is there a HTTP/1.1 in my HTTP/2 request?", gnunet, 2021/01/12
- [gnurl] 365/411: winbuild: remove docs from Makefiles and refer to README.md, gnunet, 2021/01/12
- [gnurl] 343/411: tests/*server.py: close log file after each log line, gnunet, 2021/01/12
- [gnurl] 307/411: travis: use ninja-build for CMake builds, gnunet, 2021/01/12
- [gnurl] 287/411: tests: fix some http/2 tests for older versions of nghttpx, gnunet, 2021/01/12
- [gnurl] 408/411: gnurl adjustments (paths), gnunet, 2021/01/12
- [gnurl] 405/411: urldata: restore comment on ssl_connect_data.use, gnunet, 2021/01/12