diff --git a/include/wx/private/webrequest_curl.h b/include/wx/private/webrequest_curl.h index 93990e4e5c..93e38b439c 100644 --- a/include/wx/private/webrequest_curl.h +++ b/include/wx/private/webrequest_curl.h @@ -72,7 +72,8 @@ public: wxString GetError() const; - size_t ReadData(char* buffer, size_t size); + // Method called from libcurl callback + size_t CURLOnRead(char* buffer, size_t size); private: wxWebSessionCURL& m_sessionImpl; @@ -104,9 +105,10 @@ public: wxString GetStatusText() const wxOVERRIDE { return m_statusText; } - size_t WriteData(void *buffer, size_t size); - size_t AddHeaderData(const char* buffer, size_t size); + // Methods called from libcurl callbacks + size_t CURLOnWrite(void *buffer, size_t size); + size_t CURLOnHeader(const char* buffer, size_t size); private: wxWebRequestHeaderMap m_headers; diff --git a/src/common/webrequest_curl.cpp b/src/common/webrequest_curl.cpp index 7fc5f8cebe..52d3af48f6 100644 --- a/src/common/webrequest_curl.cpp +++ b/src/common/webrequest_curl.cpp @@ -45,14 +45,14 @@ static size_t wxCURLWriteData(void* buffer, size_t size, size_t nmemb, void* use { wxCHECK_MSG( userdata, 0, "invalid curl write callback data" ); - return static_cast(userdata)->WriteData(buffer, size * nmemb); + return static_cast(userdata)->CURLOnWrite(buffer, size * nmemb); } static size_t wxCURLHeader(char *buffer, size_t size, size_t nitems, void *userdata) { wxCHECK_MSG( userdata, 0, "invalid curl header callback data" ); - return static_cast(userdata)->AddHeaderData(buffer, size * nitems); + return static_cast(userdata)->CURLOnHeader(buffer, size * nitems); } wxWebResponseCURL::wxWebResponseCURL(wxWebRequestCURL& request) : @@ -64,7 +64,7 @@ wxWebResponseCURL::wxWebResponseCURL(wxWebRequestCURL& request) : Init(); } -size_t wxWebResponseCURL::WriteData(void* buffer, size_t size) +size_t wxWebResponseCURL::CURLOnWrite(void* buffer, size_t size) { void* buf = GetDataBuffer(size); memcpy(buf, buffer, size); @@ -72,7 +72,7 @@ size_t wxWebResponseCURL::WriteData(void* buffer, size_t size) return size; } -size_t wxWebResponseCURL::AddHeaderData(const char * buffer, size_t size) +size_t wxWebResponseCURL::CURLOnHeader(const char * buffer, size_t size) { // HTTP headers are supposed to only contain ASCII data, so any encoding // should work here, but use Latin-1 for compatibility with some servers @@ -148,7 +148,7 @@ static size_t wxCURLRead(char *buffer, size_t size, size_t nitems, void *userdat { wxCHECK_MSG( userdata, 0, "invalid curl read callback data" ); - return static_cast(userdata)->ReadData(buffer, size * nitems); + return static_cast(userdata)->CURLOnRead(buffer, size * nitems); } wxWebRequestCURL::wxWebRequestCURL(wxWebSession & session, @@ -282,7 +282,7 @@ wxString wxWebRequestCURL::GetError() const return wxString(m_errorBuffer, wxConvWhateverWorks); } -size_t wxWebRequestCURL::ReadData(char* buffer, size_t size) +size_t wxWebRequestCURL::CURLOnRead(char* buffer, size_t size) { if ( m_dataStream ) {