[Scummvm-git-logs] scummvm master -> 4890dd446667c929e2bcc58af08fe39918bb6854

bgK bastien.bouclet at gmail.com
Sun Sep 24 08:25:45 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4890dd4466 NETWORKING: Fix mismatched curl callback declaration and definition


Commit: 4890dd446667c929e2bcc58af08fe39918bb6854
    https://github.com/scummvm/scummvm/commit/4890dd446667c929e2bcc58af08fe39918bb6854
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-09-24T08:24:40+02:00

Commit Message:
NETWORKING: Fix mismatched curl callback declaration and definition

Changed paths:
    backends/networking/curl/networkreadstream.cpp
    backends/networking/curl/networkreadstream.h


diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp
index d3859ce..2048840 100644
--- a/backends/networking/curl/networkreadstream.cpp
+++ b/backends/networking/curl/networkreadstream.cpp
@@ -50,7 +50,7 @@ size_t NetworkReadStream::curlHeadersCallback(char *d, size_t n, size_t l, void
 	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;
 	if (stream)
 		stream->setProgress(dlnow, dltotal);
diff --git a/backends/networking/curl/networkreadstream.h b/backends/networking/curl/networkreadstream.h
index c0ed5ee..b83ab27 100644
--- a/backends/networking/curl/networkreadstream.h
+++ b/backends/networking/curl/networkreadstream.h
@@ -63,13 +63,9 @@ class NetworkReadStream: public Common::ReadStream {
 	*/
 	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 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 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);
 public:
 	/** Send <postFields>, using POST by default. */
@@ -142,6 +138,9 @@ public:
 
 	/** Returns a number in range [0, 1], where 1 is "complete". */
 	double getProgress() const;
+
+	/** Used in curl progress callback to pass current downloaded/total values. */
+	void setProgress(uint64 downloaded, uint64 total);
 };
 
 } // End of namespace Networking





More information about the Scummvm-git-logs mailing list