projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
adab2a8
)
Fixed return type foobar in the curl progress callback
author
Ingo Ruhnke
<grumbel@gmail.com>
Mon, 29 Sep 2014 14:25:16 +0000
(16:25 +0200)
committer
Ingo Ruhnke
<grumbel@gmail.com>
Mon, 29 Sep 2014 14:25:16 +0000
(16:25 +0200)
src/addon/downloader.cpp
patch
|
blob
|
history
diff --git
a/src/addon/downloader.cpp
b/src/addon/downloader.cpp
index
d948541
..
7c51d84
100644
(file)
--- a/
src/addon/downloader.cpp
+++ b/
src/addon/downloader.cpp
@@
-153,7
+153,7
@@
public:
return size * nmemb;
}
return size * nmemb;
}
-
void
on_progress(double dltotal, double dlnow,
+
int
on_progress(double dltotal, double dlnow,
double ultotal, double ulnow)
{
m_status->dltotal = static_cast<int>(dltotal);
double ultotal, double ulnow)
{
m_status->dltotal = static_cast<int>(dltotal);
@@
-161,6
+161,8
@@
public:
m_status->ultotal = static_cast<int>(ultotal);
m_status->ulnow = static_cast<int>(ulnow);
m_status->ultotal = static_cast<int>(ultotal);
m_status->ulnow = static_cast<int>(ulnow);
+
+ return 0;
}
private:
}
private:
@@
-169,9
+171,9
@@
private:
return static_cast<Transfer*>(userdata)->on_data(ptr, size, nmemb);
}
return static_cast<Transfer*>(userdata)->on_data(ptr, size, nmemb);
}
- static
void
on_progress_wrap(void* userdata,
-
double dltotal, double dlnow,
-
double ultotal, double ulnow)
+ static
int
on_progress_wrap(void* userdata,
+ double dltotal, double dlnow,
+ double ultotal, double ulnow)
{
return static_cast<Transfer*>(userdata)->on_progress(dltotal, dlnow, ultotal, ulnow);
}
{
return static_cast<Transfer*>(userdata)->on_progress(dltotal, dlnow, ultotal, ulnow);
}