moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

tool: use XFERFUNCTION to save some casts

This commit is contained in:
Dave Reisner 2013-10-13 19:39:41 +02:00 committed by Daniel Stenberg
parent 69c0d3fbc8
commit d774802eec
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tool_cb_prg.c
View File

@ -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! */

4
src/tool_cb_prg.h
View File

@ -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 */

4
src/tool_operate.c
View File

@ -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: */