1 files changed, 9 insertions, 9 deletions

diff --git a/libs/libcurl/src/getinfo.c b/libs/libcurl/src/getinfo.c
index 8f0f213213..2e5c0d5cbe 100644
--- a/libs/libcurl/src/getinfo.c
+++ b/libs/libcurl/src/getinfo.c
@@ -31,7 +31,7 @@
 #include "vtls/vtls.h"

 #include "connect.h" /* Curl_getconnectinfo() */

 #include "progress.h"

-#include "strparse.h"

+#include "curlx/strparse.h"

 

 /* The last #include files should be: */

 #include "curl_memory.h"

@@ -207,7 +207,7 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
   const char *timestr = getenv("CURL_TIME");

   if(timestr) {

     curl_off_t val;

-    Curl_str_number(&timestr, &val, TIME_T_MAX);

+    curlx_str_number(&timestr, &val, TIME_T_MAX);

     switch(info) {

     case CURLINFO_LOCAL_PORT:

       *param_longp = (long)val;

@@ -220,7 +220,7 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
   timestr = getenv("CURL_DEBUG_SIZE");

   if(timestr) {

     curl_off_t val;

-    Curl_str_number(&timestr, &val, LONG_MAX);

+    curlx_str_number(&timestr, &val, LONG_MAX);

     switch(info) {

     case CURLINFO_HEADER_SIZE:

     case CURLINFO_REQUEST_SIZE:

@@ -384,7 +384,7 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
   const char *timestr = getenv("CURL_TIME");

   if(timestr) {

     curl_off_t val;

-    Curl_str_number(&timestr, &val, CURL_OFF_T_MAX);

+    curlx_str_number(&timestr, &val, CURL_OFF_T_MAX);

 

     switch(info) {

     case CURLINFO_TOTAL_TIME_T:

@@ -422,11 +422,11 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
     *param_offt = data->progress.ul.speed;

     break;

   case CURLINFO_CONTENT_LENGTH_DOWNLOAD_T:

-    *param_offt = (data->progress.flags & PGRS_DL_SIZE_KNOWN) ?

+    *param_offt = data->progress.dl_size_known ?

       data->progress.dl.total_size : -1;

     break;

   case CURLINFO_CONTENT_LENGTH_UPLOAD_T:

-    *param_offt = (data->progress.flags & PGRS_UL_SIZE_KNOWN) ?

+    *param_offt = data->progress.ul_size_known ?

       data->progress.ul.total_size : -1;

     break;

    case CURLINFO_TOTAL_TIME_T:

@@ -483,7 +483,7 @@ static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
   const char *timestr = getenv("CURL_TIME");

   if(timestr) {

     curl_off_t val;

-    Curl_str_number(&timestr, &val, CURL_OFF_T_MAX);

+    curlx_str_number(&timestr, &val, CURL_OFF_T_MAX);

 

     switch(info) {

     case CURLINFO_TOTAL_TIME:

@@ -534,11 +534,11 @@ static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
     *param_doublep = (double)data->progress.ul.speed;

     break;

   case CURLINFO_CONTENT_LENGTH_DOWNLOAD:

-    *param_doublep = (data->progress.flags & PGRS_DL_SIZE_KNOWN) ?

+    *param_doublep = data->progress.dl_size_known ?

       (double)data->progress.dl.total_size : -1;

     break;

   case CURLINFO_CONTENT_LENGTH_UPLOAD:

-    *param_doublep = (data->progress.flags & PGRS_UL_SIZE_KNOWN) ?

+    *param_doublep = data->progress.ul_size_known ?

       (double)data->progress.ul.total_size : -1;

     break;

   case CURLINFO_REDIRECT_TIME: