Commit d774802e authored by Dave Reisner's avatar Dave Reisner Committed by Daniel Stenberg
Browse files

tool: use XFERFUNCTION to save some casts

parent 69c0d3fb

src/tool_cb_prg.c

+5 −5
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ 
#include "memdebug.h" /* keep this as LAST include */



/*

** callback for CURLOPT_PROGRESSFUNCTION

** callback for CURLOPT_XFERINFOFUNCTION

*/



#define MAX_BARLENGTH 256



int tool_progress_cb(void *clientp,

                     double dltotal, double dlnow,

                     double ultotal, double ulnow)

                     curl_off_t dltotal, curl_off_t dlnow,

                     curl_off_t ultotal, curl_off_t ulnow)

{

  /* The original progress-bar source code was written for curl by Lars Aas,

     and this new edition inherits some of his concepts. */
@@ -60,10 +60,10 @@ int tool_progress_cb(void *clientp, 
    return 0;



  /* expected transfer size */

  total = (curl_off_t)dltotal + (curl_off_t)ultotal + bar->initial_size;

  total = dltotal + ultotal + bar->initial_size;



  /* we've come this far */

  point = (curl_off_t)dlnow + (curl_off_t)ulnow + bar->initial_size;

  point = dlnow + ulnow + bar->initial_size;



  if(point > total)

    /* we have got more than the expected total! */

src/tool_cb_prg.h

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ void progressbarinit(struct ProgressData *bar, 
*/



int tool_progress_cb(void *clientp,

                     double dltotal, double dlnow,

                     double ultotal, double ulnow);

                     curl_off_t dltotal, curl_off_t dlnow,

                     curl_off_t ultotal, curl_off_t ulnow);



#endif /* HEADER_CURL_TOOL_CB_PRG_H */

src/tool_operate.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,8 +1235,8 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) 
           !config->noprogress && !config->mute) {

          /* we want the alternative style, then we have to implement it

             ourselves! */

          my_setopt(curl, CURLOPT_PROGRESSFUNCTION, tool_progress_cb);

          my_setopt(curl, CURLOPT_PROGRESSDATA, &progressbar);

          my_setopt(curl, CURLOPT_XFERINFOFUNCTION, tool_progress_cb);

          my_setopt(curl, CURLOPT_XFERINFODATA, &progressbar);

        }



        /* new in libcurl 7.24.0: */