aboutsummaryrefslogtreecommitdiff
path: root/backends/networking
diff options
context:
space:
mode:
Diffstat (limited to 'backends/networking')
-rw-r--r--backends/networking/curl/curljsonrequest.cpp5
-rw-r--r--backends/networking/curl/curljsonrequest.h2
-rw-r--r--backends/networking/curl/curlrequest.cpp7
-rw-r--r--backends/networking/curl/curlrequest.h2
-rw-r--r--backends/networking/curl/request.h4
5 files changed, 6 insertions, 14 deletions
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index 11eeb2904a..fd3d631ba9 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -54,7 +54,7 @@ char *CurlJsonRequest::getPreparedContents() {
return (char *)result;
}
-bool CurlJsonRequest::handle() {
+void CurlJsonRequest::handle() {
if (!_stream) _stream = new NetworkReadStream(_url, _headersList, _postFields);
if (_stream) {
@@ -77,11 +77,8 @@ bool CurlJsonRequest::handle() {
Common::JSONValue *json = Common::JSON::parse(contents);
(*_callback)(RequestDataPair(_id, json)); //potential memory leak, free it in your callbacks!
}
- return true;
}
}
-
- return false;
}
} //end of namespace Networking
diff --git a/backends/networking/curl/curljsonrequest.h b/backends/networking/curl/curljsonrequest.h
index 9b23cd79f4..3d5dd7858b 100644
--- a/backends/networking/curl/curljsonrequest.h
+++ b/backends/networking/curl/curljsonrequest.h
@@ -40,7 +40,7 @@ public:
CurlJsonRequest(DataCallback cb, const char *url); //TODO: use some Callback<JSON> already
virtual ~CurlJsonRequest();
- virtual bool handle();
+ virtual void handle();
};
} //end of namespace Networking
diff --git a/backends/networking/curl/curlrequest.cpp b/backends/networking/curl/curlrequest.cpp
index 6f5c612bdf..e30b7ce018 100644
--- a/backends/networking/curl/curlrequest.cpp
+++ b/backends/networking/curl/curlrequest.cpp
@@ -37,17 +37,14 @@ CurlRequest::~CurlRequest() {
if (_stream) delete _stream;
}
-bool CurlRequest::handle() {
+void CurlRequest::handle() {
if (!_stream) _stream = new NetworkReadStream(_url, _headersList, _postFields);
if (_stream && _stream->eos()) {
if (_stream->httpResponseCode() != 200)
warning("HTTP response code is not 200 OK (it's %ld)", _stream->httpResponseCode());
- ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
- return true;
+ ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
}
-
- return false;
}
void CurlRequest::restart() {
diff --git a/backends/networking/curl/curlrequest.h b/backends/networking/curl/curlrequest.h
index c7f07fcb18..1a644e4369 100644
--- a/backends/networking/curl/curlrequest.h
+++ b/backends/networking/curl/curlrequest.h
@@ -43,7 +43,7 @@ public:
CurlRequest(DataCallback cb, const char *url);
virtual ~CurlRequest();
- virtual bool handle();
+ virtual void handle();
virtual void restart();
void addHeader(Common::String header);
diff --git a/backends/networking/curl/request.h b/backends/networking/curl/request.h
index f2c2f1f247..d81fe903b8 100644
--- a/backends/networking/curl/request.h
+++ b/backends/networking/curl/request.h
@@ -55,11 +55,9 @@ public:
/**
* Method, which does actual work. Depends on what this Request is doing.
- *
- * @return true if request's work is complete and it may be removed from Storage's list
*/
- virtual bool handle() = 0;
+ virtual void handle() = 0;
virtual void restart() = 0;