1 files changed, 14 insertions, 11 deletions

diff --git a/libs/libcurl/src/getinfo.c b/libs/libcurl/src/getinfo.c
index 001c9fc671..a3f159e446 100644
--- a/libs/libcurl/src/getinfo.c
+++ b/libs/libcurl/src/getinfo.c
@@ -57,7 +57,7 @@ CURLcode Curl_initinfo(struct Curl_easy *data)
   pro->t_starttransfer = 0;

   pro->timespent = 0;

   pro->t_redirect = 0;

-  pro->is_t_startransfer_set = false;

+  pro->is_t_startransfer_set = FALSE;

 

   info->httpcode = 0;

   info->httpproxycode = 0;

@@ -96,7 +96,7 @@ static CURLcode getinfo_char(struct Curl_easy *data, CURLINFO info,
 {

   switch(info) {

   case CURLINFO_EFFECTIVE_URL:

-    *param_charp = data->state.url?data->state.url:(char *)"";

+    *param_charp = data->state.url ? data->state.url : (char *)"";

     break;

   case CURLINFO_EFFECTIVE_METHOD: {

     const char *m = data->set.str[STRING_CUSTOMREQUEST];

@@ -405,12 +405,12 @@ 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)?

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

+    *param_offt = (data->progress.flags & PGRS_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)?

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

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

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

     break;

    case CURLINFO_TOTAL_TIME_T:

     *param_offt = data->progress.timespent;

@@ -446,9 +446,12 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
     *param_offt = data->id;

     break;

   case CURLINFO_CONN_ID:

-    *param_offt = data->conn?

+    *param_offt = data->conn ?

       data->conn->connection_id : data->state.recent_conn_id;

     break;

+  case CURLINFO_EARLYDATA_SENT_T:

+    *param_offt = data->progress.earlydata_sent;

+    break;

   default:

     return CURLE_UNKNOWN_OPTION;

   }

@@ -512,12 +515,12 @@ 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)?

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

+    *param_doublep = (data->progress.flags & PGRS_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)?

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

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

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

     break;

   case CURLINFO_REDIRECT_TIME:

     *param_doublep = DOUBLE_SECS(data->progress.t_redirect);