Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 2 of 2.

1 files changed, 211 insertions, 211 deletions

diff --git a/contrib/libs/curl/lib/progress.c b/contrib/libs/curl/lib/progress.c
index 0e36367836..658d05ab8e 100644
--- a/contrib/libs/curl/lib/progress.c
+++ b/contrib/libs/curl/lib/progress.c
@@ -24,41 +24,41 @@
 
 #include "urldata.h"
 #include "sendf.h"
-#include "multiif.h" 
+#include "multiif.h"
 #include "progress.h"
 #include "timeval.h"
-#include "curl_printf.h" 
+#include "curl_printf.h"
 
-/* check rate limits within this many recent milliseconds, at minimum. */ 
-#define MIN_RATE_LIMIT_PERIOD 3000 
+/* check rate limits within this many recent milliseconds, at minimum. */
+#define MIN_RATE_LIMIT_PERIOD 3000
 
 #ifndef CURL_DISABLE_PROGRESS_METER
 /* Provide a string that is 2 + 1 + 2 + 1 + 2 = 8 letters long (plus the zero
    byte) */
 static void time2str(char *r, curl_off_t seconds)
 {
-  curl_off_t h; 
+  curl_off_t h;
   if(seconds <= 0) {
     strcpy(r, "--:--:--");
     return;
   }
   h = seconds / CURL_OFF_T_C(3600);
   if(h <= CURL_OFF_T_C(99)) {
-    curl_off_t m = (seconds - (h*CURL_OFF_T_C(3600))) / CURL_OFF_T_C(60); 
-    curl_off_t s = (seconds - (h*CURL_OFF_T_C(3600))) - (m*CURL_OFF_T_C(60)); 
-    msnprintf(r, 9, "%2" CURL_FORMAT_CURL_OFF_T ":%02" CURL_FORMAT_CURL_OFF_T 
-              ":%02" CURL_FORMAT_CURL_OFF_T, h, m, s); 
+    curl_off_t m = (seconds - (h*CURL_OFF_T_C(3600))) / CURL_OFF_T_C(60);
+    curl_off_t s = (seconds - (h*CURL_OFF_T_C(3600))) - (m*CURL_OFF_T_C(60));
+    msnprintf(r, 9, "%2" CURL_FORMAT_CURL_OFF_T ":%02" CURL_FORMAT_CURL_OFF_T
+              ":%02" CURL_FORMAT_CURL_OFF_T, h, m, s);
   }
   else {
     /* this equals to more than 99 hours, switch to a more suitable output
        format to fit within the limits. */
-    curl_off_t d = seconds / CURL_OFF_T_C(86400); 
+    curl_off_t d = seconds / CURL_OFF_T_C(86400);
     h = (seconds - (d*CURL_OFF_T_C(86400))) / CURL_OFF_T_C(3600);
     if(d <= CURL_OFF_T_C(999))
-      msnprintf(r, 9, "%3" CURL_FORMAT_CURL_OFF_T 
-                "d %02" CURL_FORMAT_CURL_OFF_T "h", d, h); 
+      msnprintf(r, 9, "%3" CURL_FORMAT_CURL_OFF_T
+                "d %02" CURL_FORMAT_CURL_OFF_T "h", d, h);
     else
-      msnprintf(r, 9, "%7" CURL_FORMAT_CURL_OFF_T "d", d); 
+      msnprintf(r, 9, "%7" CURL_FORMAT_CURL_OFF_T "d", d);
   }
 }
 
@@ -74,40 +74,40 @@ static char *max5data(curl_off_t bytes, char *max5)
 #define ONE_PETABYTE (CURL_OFF_T_C(1024) * ONE_TERABYTE)
 
   if(bytes < CURL_OFF_T_C(100000))
-    msnprintf(max5, 6, "%5" CURL_FORMAT_CURL_OFF_T, bytes); 
+    msnprintf(max5, 6, "%5" CURL_FORMAT_CURL_OFF_T, bytes);
 
   else if(bytes < CURL_OFF_T_C(10000) * ONE_KILOBYTE)
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "k", bytes/ONE_KILOBYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "k", bytes/ONE_KILOBYTE);
 
   else if(bytes < CURL_OFF_T_C(100) * ONE_MEGABYTE)
     /* 'XX.XM' is good as long as we're less than 100 megs */
-    msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0" 
-              CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE, 
-              (bytes%ONE_MEGABYTE) / (ONE_MEGABYTE/CURL_OFF_T_C(10)) ); 
+    msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0"
+              CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE,
+              (bytes%ONE_MEGABYTE) / (ONE_MEGABYTE/CURL_OFF_T_C(10)) );
 
 #if (CURL_SIZEOF_CURL_OFF_T > 4)
 
   else if(bytes < CURL_OFF_T_C(10000) * ONE_MEGABYTE)
     /* 'XXXXM' is good until we're at 10000MB or above */
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE);
 
   else if(bytes < CURL_OFF_T_C(100) * ONE_GIGABYTE)
     /* 10000 MB - 100 GB, we show it as XX.XG */
-    msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0" 
-              CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE, 
-              (bytes%ONE_GIGABYTE) / (ONE_GIGABYTE/CURL_OFF_T_C(10)) ); 
+    msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0"
+              CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE,
+              (bytes%ONE_GIGABYTE) / (ONE_GIGABYTE/CURL_OFF_T_C(10)) );
 
   else if(bytes < CURL_OFF_T_C(10000) * ONE_GIGABYTE)
     /* up to 10000GB, display without decimal: XXXXG */
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE);
 
   else if(bytes < CURL_OFF_T_C(10000) * ONE_TERABYTE)
     /* up to 10000TB, display without decimal: XXXXT */
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "T", bytes/ONE_TERABYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "T", bytes/ONE_TERABYTE);
 
   else
     /* up to 10000PB, display without decimal: XXXXP */
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "P", bytes/ONE_PETABYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "P", bytes/ONE_PETABYTE);
 
     /* 16384 petabytes (16 exabytes) is the maximum a 64 bit unsigned number
        can hold, but our data type is signed so 8192PB will be the maximum. */
@@ -115,7 +115,7 @@ static char *max5data(curl_off_t bytes, char *max5)
 #else
 
   else
-    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE); 
+    msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE);
 
 #endif
 
@@ -140,8 +140,8 @@ static char *max5data(curl_off_t bytes, char *max5)
 int Curl_pgrsDone(struct connectdata *conn)
 {
   int rc;
-  struct Curl_easy *data = conn->data; 
-  data->progress.lastshow = 0; 
+  struct Curl_easy *data = conn->data;
+  data->progress.lastshow = 0;
   rc = Curl_pgrsUpdate(conn); /* the final (forced) update */
   if(rc)
     return rc;
@@ -156,23 +156,23 @@ int Curl_pgrsDone(struct connectdata *conn)
   return 0;
 }
 
-/* reset the known transfer sizes */ 
-void Curl_pgrsResetTransferSizes(struct Curl_easy *data) 
+/* reset the known transfer sizes */
+void Curl_pgrsResetTransferSizes(struct Curl_easy *data)
 {
-  Curl_pgrsSetDownloadSize(data, -1); 
-  Curl_pgrsSetUploadSize(data, -1); 
+  Curl_pgrsSetDownloadSize(data, -1);
+  Curl_pgrsSetUploadSize(data, -1);
 }
 
-/* 
+/*
  *
  * Curl_pgrsTime(). Store the current time at the given label. This fetches a
  * fresh "now" and returns it.
  *
- * @unittest: 1399 
- */ 
+ * @unittest: 1399
+ */
 struct curltime Curl_pgrsTime(struct Curl_easy *data, timerid timer)
 {
-  struct curltime now = Curl_now(); 
+  struct curltime now = Curl_now();
   timediff_t *delta = NULL;
 
   switch(timer) {
@@ -180,234 +180,234 @@ struct curltime Curl_pgrsTime(struct Curl_easy *data, timerid timer)
   case TIMER_NONE:
     /* mistake filter */
     break;
-  case TIMER_STARTOP: 
-    /* This is set at the start of a transfer */ 
-    data->progress.t_startop = now; 
-    break; 
+  case TIMER_STARTOP:
+    /* This is set at the start of a transfer */
+    data->progress.t_startop = now;
+    break;
   case TIMER_STARTSINGLE:
-    /* This is set at the start of each single fetch */ 
+    /* This is set at the start of each single fetch */
     data->progress.t_startsingle = now;
-    data->progress.is_t_startransfer_set = false; 
+    data->progress.is_t_startransfer_set = false;
     break;
   case TIMER_STARTACCEPT:
-    data->progress.t_acceptdata = now; 
+    data->progress.t_acceptdata = now;
     break;
   case TIMER_NAMELOOKUP:
-    delta = &data->progress.t_nslookup; 
+    delta = &data->progress.t_nslookup;
     break;
   case TIMER_CONNECT:
-    delta = &data->progress.t_connect; 
+    delta = &data->progress.t_connect;
     break;
   case TIMER_APPCONNECT:
-    delta = &data->progress.t_appconnect; 
+    delta = &data->progress.t_appconnect;
     break;
   case TIMER_PRETRANSFER:
-    delta = &data->progress.t_pretransfer; 
+    delta = &data->progress.t_pretransfer;
     break;
   case TIMER_STARTTRANSFER:
-    delta = &data->progress.t_starttransfer; 
-    /* prevent updating t_starttransfer unless: 
-     *   1) this is the first time we're setting t_starttransfer 
-     *   2) a redirect has occurred since the last time t_starttransfer was set 
-     * This prevents repeated invocations of the function from incorrectly 
-     * changing the t_starttransfer time. 
-     */ 
-    if(data->progress.is_t_startransfer_set) { 
+    delta = &data->progress.t_starttransfer;
+    /* prevent updating t_starttransfer unless:
+     *   1) this is the first time we're setting t_starttransfer
+     *   2) a redirect has occurred since the last time t_starttransfer was set
+     * This prevents repeated invocations of the function from incorrectly
+     * changing the t_starttransfer time.
+     */
+    if(data->progress.is_t_startransfer_set) {
       return now;
-    } 
-    else { 
-      data->progress.is_t_startransfer_set = true; 
-      break; 
-    } 
+    }
+    else {
+      data->progress.is_t_startransfer_set = true;
+      break;
+    }
   case TIMER_POSTRANSFER:
     /* this is the normal end-of-transfer thing */
     break;
   case TIMER_REDIRECT:
-    data->progress.t_redirect = Curl_timediff_us(now, data->progress.start); 
+    data->progress.t_redirect = Curl_timediff_us(now, data->progress.start);
     break;
   }
-  if(delta) { 
-    timediff_t us = Curl_timediff_us(now, data->progress.t_startsingle); 
-    if(us < 1) 
-      us = 1; /* make sure at least one microsecond passed */ 
-    *delta += us; 
-  } 
+  if(delta) {
+    timediff_t us = Curl_timediff_us(now, data->progress.t_startsingle);
+    if(us < 1)
+      us = 1; /* make sure at least one microsecond passed */
+    *delta += us;
+  }
   return now;
 }
 
-void Curl_pgrsStartNow(struct Curl_easy *data) 
+void Curl_pgrsStartNow(struct Curl_easy *data)
 {
   data->progress.speeder_c = 0; /* reset the progress meter display */
-  data->progress.start = Curl_now(); 
-  data->progress.is_t_startransfer_set = false; 
+  data->progress.start = Curl_now();
+  data->progress.is_t_startransfer_set = false;
   data->progress.ul_limit_start = data->progress.start;
   data->progress.dl_limit_start = data->progress.start;
   data->progress.downloaded = 0;
   data->progress.uploaded = 0;
   /* clear all bits except HIDE and HEADERS_OUT */
   data->progress.flags &= PGRS_HIDE|PGRS_HEADERS_OUT;
-  Curl_ratelimit(data, data->progress.start); 
+  Curl_ratelimit(data, data->progress.start);
 }
 
-/* 
- * This is used to handle speed limits, calculating how many milliseconds to 
- * wait until we're back under the speed limit, if needed. 
- * 
- * The way it works is by having a "starting point" (time & amount of data 
- * transferred by then) used in the speed computation, to be used instead of 
- * the start of the transfer.  This starting point is regularly moved as 
- * transfer goes on, to keep getting accurate values (instead of average over 
- * the entire transfer). 
- * 
- * This function takes the current amount of data transferred, the amount at 
- * the starting point, the limit (in bytes/s), the time of the starting point 
- * and the current time. 
- * 
- * Returns 0 if no waiting is needed or when no waiting is needed but the 
- * starting point should be reset (to current); or the number of milliseconds 
- * to wait to get back under the speed limit. 
- */ 
-timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize, 
-                                  curl_off_t startsize, 
-                                  curl_off_t limit, 
-                                  struct curltime start, 
-                                  struct curltime now) 
+/*
+ * This is used to handle speed limits, calculating how many milliseconds to
+ * wait until we're back under the speed limit, if needed.
+ *
+ * The way it works is by having a "starting point" (time & amount of data
+ * transferred by then) used in the speed computation, to be used instead of
+ * the start of the transfer.  This starting point is regularly moved as
+ * transfer goes on, to keep getting accurate values (instead of average over
+ * the entire transfer).
+ *
+ * This function takes the current amount of data transferred, the amount at
+ * the starting point, the limit (in bytes/s), the time of the starting point
+ * and the current time.
+ *
+ * Returns 0 if no waiting is needed or when no waiting is needed but the
+ * starting point should be reset (to current); or the number of milliseconds
+ * to wait to get back under the speed limit.
+ */
+timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize,
+                                  curl_off_t startsize,
+                                  curl_off_t limit,
+                                  struct curltime start,
+                                  struct curltime now)
 {
-  curl_off_t size = cursize - startsize; 
+  curl_off_t size = cursize - startsize;
   timediff_t minimum;
   timediff_t actual;
- 
-  if(!limit || !size) 
-    return 0; 
- 
-  /* 
-   * 'minimum' is the number of milliseconds 'size' should take to download to 
-   * stay below 'limit'. 
-   */ 
-  if(size < CURL_OFF_T_MAX/1000) 
+
+  if(!limit || !size)
+    return 0;
+
+  /*
+   * 'minimum' is the number of milliseconds 'size' should take to download to
+   * stay below 'limit'.
+   */
+  if(size < CURL_OFF_T_MAX/1000)
     minimum = (timediff_t) (CURL_OFF_T_C(1000) * size / limit);
-  else { 
+  else {
     minimum = (timediff_t) (size / limit);
     if(minimum < TIMEDIFF_T_MAX/1000)
-      minimum *= 1000; 
-    else 
+      minimum *= 1000;
+    else
       minimum = TIMEDIFF_T_MAX;
-  } 
- 
-  /* 
-   * 'actual' is the time in milliseconds it took to actually download the 
-   * last 'size' bytes. 
-   */ 
-  actual = Curl_timediff(now, start); 
-  if(actual < minimum) { 
-    /* if it downloaded the data faster than the limit, make it wait the 
-       difference */ 
-    return (minimum - actual); 
-  } 
- 
-  return 0; 
-} 
- 
-/* 
- * Set the number of downloaded bytes so far. 
- */ 
-void Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size) 
-{ 
+  }
+
+  /*
+   * 'actual' is the time in milliseconds it took to actually download the
+   * last 'size' bytes.
+   */
+  actual = Curl_timediff(now, start);
+  if(actual < minimum) {
+    /* if it downloaded the data faster than the limit, make it wait the
+       difference */
+    return (minimum - actual);
+  }
+
+  return 0;
+}
+
+/*
+ * Set the number of downloaded bytes so far.
+ */
+void Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size)
+{
   data->progress.downloaded = size;
 }
 
-/* 
- * Update the timestamp and sizestamp to use for rate limit calculations. 
- */ 
-void Curl_ratelimit(struct Curl_easy *data, struct curltime now) 
+/*
+ * Update the timestamp and sizestamp to use for rate limit calculations.
+ */
+void Curl_ratelimit(struct Curl_easy *data, struct curltime now)
+{
+  /* don't set a new stamp unless the time since last update is long enough */
+  if(data->set.max_recv_speed > 0) {
+    if(Curl_timediff(now, data->progress.dl_limit_start) >=
+       MIN_RATE_LIMIT_PERIOD) {
+      data->progress.dl_limit_start = now;
+      data->progress.dl_limit_size = data->progress.downloaded;
+    }
+  }
+  if(data->set.max_send_speed > 0) {
+    if(Curl_timediff(now, data->progress.ul_limit_start) >=
+       MIN_RATE_LIMIT_PERIOD) {
+      data->progress.ul_limit_start = now;
+      data->progress.ul_limit_size = data->progress.uploaded;
+    }
+  }
+}
+
+/*
+ * Set the number of uploaded bytes so far.
+ */
+void Curl_pgrsSetUploadCounter(struct Curl_easy *data, curl_off_t size)
 {
-  /* don't set a new stamp unless the time since last update is long enough */ 
-  if(data->set.max_recv_speed > 0) { 
-    if(Curl_timediff(now, data->progress.dl_limit_start) >= 
-       MIN_RATE_LIMIT_PERIOD) { 
-      data->progress.dl_limit_start = now; 
-      data->progress.dl_limit_size = data->progress.downloaded; 
-    } 
-  } 
-  if(data->set.max_send_speed > 0) { 
-    if(Curl_timediff(now, data->progress.ul_limit_start) >= 
-       MIN_RATE_LIMIT_PERIOD) { 
-      data->progress.ul_limit_start = now; 
-      data->progress.ul_limit_size = data->progress.uploaded; 
-    } 
-  } 
-} 
- 
-/* 
- * Set the number of uploaded bytes so far. 
- */ 
-void Curl_pgrsSetUploadCounter(struct Curl_easy *data, curl_off_t size) 
-{ 
   data->progress.uploaded = size;
 }
 
-void Curl_pgrsSetDownloadSize(struct Curl_easy *data, curl_off_t size) 
+void Curl_pgrsSetDownloadSize(struct Curl_easy *data, curl_off_t size)
 {
-  if(size >= 0) { 
-    data->progress.size_dl = size; 
+  if(size >= 0) {
+    data->progress.size_dl = size;
     data->progress.flags |= PGRS_DL_SIZE_KNOWN;
-  } 
-  else { 
-    data->progress.size_dl = 0; 
+  }
+  else {
+    data->progress.size_dl = 0;
     data->progress.flags &= ~PGRS_DL_SIZE_KNOWN;
-  } 
+  }
 }
 
-void Curl_pgrsSetUploadSize(struct Curl_easy *data, curl_off_t size) 
+void Curl_pgrsSetUploadSize(struct Curl_easy *data, curl_off_t size)
 {
-  if(size >= 0) { 
-    data->progress.size_ul = size; 
+  if(size >= 0) {
+    data->progress.size_ul = size;
     data->progress.flags |= PGRS_UL_SIZE_KNOWN;
-  } 
-  else { 
-    data->progress.size_ul = 0; 
+  }
+  else {
+    data->progress.size_ul = 0;
     data->progress.flags &= ~PGRS_UL_SIZE_KNOWN;
-  } 
+  }
 }
 
 /* returns TRUE if it's time to show the progress meter */
 static bool progress_calc(struct connectdata *conn, struct curltime now)
 {
   curl_off_t timespent;
-  curl_off_t timespent_ms; /* milliseconds */ 
-  struct Curl_easy *data = conn->data; 
-  curl_off_t dl = data->progress.downloaded; 
-  curl_off_t ul = data->progress.uploaded; 
+  curl_off_t timespent_ms; /* milliseconds */
+  struct Curl_easy *data = conn->data;
+  curl_off_t dl = data->progress.downloaded;
+  curl_off_t ul = data->progress.uploaded;
   bool timetoshow = FALSE;
 
   /* The time spent so far (from the start) */
-  data->progress.timespent = Curl_timediff_us(now, data->progress.start); 
-  timespent = (curl_off_t)data->progress.timespent/1000000; /* seconds */ 
-  timespent_ms = (curl_off_t)data->progress.timespent/1000; /* ms */ 
+  data->progress.timespent = Curl_timediff_us(now, data->progress.start);
+  timespent = (curl_off_t)data->progress.timespent/1000000; /* seconds */
+  timespent_ms = (curl_off_t)data->progress.timespent/1000; /* ms */
 
   /* The average download speed this far */
-  if(dl < CURL_OFF_T_MAX/1000) 
-    data->progress.dlspeed = (dl * 1000 / (timespent_ms>0?timespent_ms:1)); 
-  else 
-    data->progress.dlspeed = (dl / (timespent>0?timespent:1)); 
+  if(dl < CURL_OFF_T_MAX/1000)
+    data->progress.dlspeed = (dl * 1000 / (timespent_ms>0?timespent_ms:1));
+  else
+    data->progress.dlspeed = (dl / (timespent>0?timespent:1));
 
   /* The average upload speed this far */
-  if(ul < CURL_OFF_T_MAX/1000) 
-    data->progress.ulspeed = (ul * 1000 / (timespent_ms>0?timespent_ms:1)); 
-  else 
-    data->progress.ulspeed = (ul / (timespent>0?timespent:1)); 
+  if(ul < CURL_OFF_T_MAX/1000)
+    data->progress.ulspeed = (ul * 1000 / (timespent_ms>0?timespent_ms:1));
+  else
+    data->progress.ulspeed = (ul / (timespent>0?timespent:1));
 
   /* Calculations done at most once a second, unless end is reached */
-  if(data->progress.lastshow != now.tv_sec) { 
-    int countindex; /* amount of seconds stored in the speeder array */ 
+  if(data->progress.lastshow != now.tv_sec) {
+    int countindex; /* amount of seconds stored in the speeder array */
     int nowindex = data->progress.speeder_c% CURR_TIME;
     data->progress.lastshow = now.tv_sec;
     timetoshow = TRUE;
 
-    /* Let's do the "current speed" thing, with the dl + ul speeds 
-       combined. Store the speed at entry 'nowindex'. */ 
+    /* Let's do the "current speed" thing, with the dl + ul speeds
+       combined. Store the speed at entry 'nowindex'. */
     data->progress.speeder[ nowindex ] =
-      data->progress.downloaded + data->progress.uploaded; 
+      data->progress.downloaded + data->progress.uploaded;
 
     /* remember the exact time for this moment */
     data->progress.speeder_time [ nowindex ] = now;
@@ -420,24 +420,24 @@ static bool progress_calc(struct connectdata *conn, struct curltime now)
        array. With N_ENTRIES filled in, we have about N_ENTRIES-1 seconds of
        transfer. Imagine, after one second we have filled in two entries,
        after two seconds we've filled in three entries etc. */
-    countindex = ((data->progress.speeder_c >= CURR_TIME)? 
+    countindex = ((data->progress.speeder_c >= CURR_TIME)?
                   CURR_TIME:data->progress.speeder_c) - 1;
 
     /* first of all, we don't do this if there's no counted seconds yet */
     if(countindex) {
-      int checkindex; 
-      timediff_t span_ms; 
+      int checkindex;
+      timediff_t span_ms;
 
       /* Get the index position to compare with the 'nowindex' position.
          Get the oldest entry possible. While we have less than CURR_TIME
          entries, the first entry will remain the oldest. */
-      checkindex = (data->progress.speeder_c >= CURR_TIME)? 
+      checkindex = (data->progress.speeder_c >= CURR_TIME)?
         data->progress.speeder_c%CURR_TIME:0;
 
       /* Figure out the exact time for the time span */
       span_ms = Curl_timediff(now, data->progress.speeder_time[checkindex]);
       if(0 == span_ms)
-        span_ms = 1; /* at least one millisecond MUST have passed */ 
+        span_ms = 1; /* at least one millisecond MUST have passed */
 
       /* Calculate the average speed the last 'span_ms' milliseconds */
       {
@@ -456,9 +456,9 @@ static bool progress_calc(struct connectdata *conn, struct curltime now)
       }
     }
     else
-      /* the first second we use the average */ 
+      /* the first second we use the average */
       data->progress.current_speed =
-        data->progress.ulspeed + data->progress.dlspeed; 
+        data->progress.ulspeed + data->progress.dlspeed;
 
   } /* Calculations end */
   return timetoshow;
@@ -588,15 +588,15 @@ int Curl_pgrsUpdate(struct connectdata *conn)
   bool showprogress = progress_calc(conn, now);
   if(!(data->progress.flags & PGRS_HIDE)) {
     if(data->set.fxferinfo) {
-      int result; 
+      int result;
       /* There's a callback set, call that */
-      Curl_set_in_callback(data, true); 
-      result = data->set.fxferinfo(data->set.progress_client, 
-                                   data->progress.size_dl, 
-                                   data->progress.downloaded, 
-                                   data->progress.size_ul, 
-                                   data->progress.uploaded); 
-      Curl_set_in_callback(data, false); 
+      Curl_set_in_callback(data, true);
+      result = data->set.fxferinfo(data->set.progress_client,
+                                   data->progress.size_dl,
+                                   data->progress.downloaded,
+                                   data->progress.size_ul,
+                                   data->progress.uploaded);
+      Curl_set_in_callback(data, false);
       if(result != CURL_PROGRESSFUNC_CONTINUE) {
         if(result)
           failf(data, "Callback aborted");
@@ -604,15 +604,15 @@ int Curl_pgrsUpdate(struct connectdata *conn)
       }
     }
     else if(data->set.fprogress) {
-      int result; 
+      int result;
       /* The older deprecated callback is set, call that */
-      Curl_set_in_callback(data, true); 
-      result = data->set.fprogress(data->set.progress_client, 
-                                   (double)data->progress.size_dl, 
-                                   (double)data->progress.downloaded, 
-                                   (double)data->progress.size_ul, 
-                                   (double)data->progress.uploaded); 
-      Curl_set_in_callback(data, false); 
+      Curl_set_in_callback(data, true);
+      result = data->set.fprogress(data->set.progress_client,
+                                   (double)data->progress.size_dl,
+                                   (double)data->progress.downloaded,
+                                   (double)data->progress.size_ul,
+                                   (double)data->progress.uploaded);
+      Curl_set_in_callback(data, false);
       if(result != CURL_PROGRESSFUNC_CONTINUE) {
         if(result)
           failf(data, "Callback aborted");