thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NETWORKING: Fix mismatched curl callback declaration and definition

Browse source
This commit is contained in:
Bastien Bouclet 2017-09-24 08:24:40 +02:00
parent 25d66b2a08
commit 4890dd4466
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/networking/curl/networkreadstream.cpp
View file

@ -50,7 +50,7 @@ size_t NetworkReadStream::curlHeadersCallback(char *d, size_t n, size_t l, void
return 0; return 0;
} }
int NetworkReadStream::curlProgressCallback(void *p, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { static int curlProgressCallback(void *p, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) {
NetworkReadStream *stream = (NetworkReadStream *)p; NetworkReadStream *stream = (NetworkReadStream *)p;
if (stream) if (stream)
stream->setProgress(dlnow, dltotal); stream->setProgress(dlnow, dltotal);

7
backends/networking/curl/networkreadstream.h
View file

@ -63,13 +63,9 @@ class NetworkReadStream: public Common::ReadStream {
*/ */
uint32 addResponseHeaders(char *buffer, uint32 bufferSize); uint32 addResponseHeaders(char *buffer, uint32 bufferSize);
/** Used in curl progress callback to pass current downloaded/total values. */
void setProgress(uint64 downloaded, uint64 total);
static size_t curlDataCallback(char *d, size_t n, size_t l, void *p); static size_t curlDataCallback(char *d, size_t n, size_t l, void *p);
static size_t curlReadDataCallback(char *d, size_t n, size_t l, void *p); static size_t curlReadDataCallback(char *d, size_t n, size_t l, void *p);
static size_t curlHeadersCallback(char *d, size_t n, size_t l, void *p); static size_t curlHeadersCallback(char *d, size_t n, size_t l, void *p);
static int curlProgressCallback(void *p, long dltotal, long dlnow, long ultotal, long ulnow);
static int curlProgressCallbackOlder(void *p, double dltotal, double dlnow, double ultotal, double ulnow); static int curlProgressCallbackOlder(void *p, double dltotal, double dlnow, double ultotal, double ulnow);
public: public:
/** Send <postFields>, using POST by default. */ /** Send <postFields>, using POST by default. */
@ -142,6 +138,9 @@ public:
/** Returns a number in range [0, 1], where 1 is "complete". */ /** Returns a number in range [0, 1], where 1 is "complete". */
double getProgress() const; double getProgress() const;
/** Used in curl progress callback to pass current downloaded/total values. */
void setProgress(uint64 downloaded, uint64 total);
}; };
} // End of namespace Networking } // End of namespace Networking