aboutsummaryrefslogtreecommitdiff
path: root/backends/networking/curl
diff options
context:
space:
mode:
authorAlexander Tkachev2016-07-21 11:44:36 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commit438ba985a4a97a8695a6e6fdda6930694976c07b (patch)
tree066e589b809278ff2e06df31069f8ea3fb6989d7 /backends/networking/curl
parent01161ae7ddbc5f147dd9e71991eb2f1a1c9a7b06 (diff)
downloadscummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.tar.gz
scummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.tar.bz2
scummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.zip
JANITORIAL: Remove spaces at the end of the line
I knew there were some, but I wanted to fix them once, instead of doing it all the time.
Diffstat (limited to 'backends/networking/curl')
-rw-r--r--backends/networking/curl/cloudicon.cpp8
-rw-r--r--backends/networking/curl/connectionmanager.cpp12
-rw-r--r--backends/networking/curl/connectionmanager.h6
-rw-r--r--backends/networking/curl/curljsonrequest.h2
-rw-r--r--backends/networking/curl/curlrequest.cpp6
-rw-r--r--backends/networking/curl/networkreadstream.cpp8
-rw-r--r--backends/networking/curl/networkreadstream.h2
7 files changed, 22 insertions, 22 deletions
diff --git a/backends/networking/curl/cloudicon.cpp b/backends/networking/curl/cloudicon.cpp
index 554fc79a3f..5178522583 100644
--- a/backends/networking/curl/cloudicon.cpp
+++ b/backends/networking/curl/cloudicon.cpp
@@ -44,8 +44,8 @@ CloudIcon::~CloudIcon() {}
bool CloudIcon::draw() {
bool stop = false;
initIcons();
-
- if (CloudMan.isWorking() || _disabledFrames > 0) {
+
+ if (CloudMan.isWorking() || _disabledFrames > 0) {
if (g_system) {
if (!_wasVisible) {
g_system->clearOSD();
@@ -109,8 +109,8 @@ void CloudIcon::initIcons() {
_iconsInited = true;
}
-void CloudIcon::loadIcon(Graphics::TransparentSurface &icon, byte *data, uint32 size) {
- Image::PNGDecoder decoder;
+void CloudIcon::loadIcon(Graphics::TransparentSurface &icon, byte *data, uint32 size) {
+ Image::PNGDecoder decoder;
Common::MemoryReadStream stream(data, size);
if (!decoder.loadStream(stream))
error("CloudIcon::loadIcon: error decoding PNG");
diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp
index 6affad7c1d..cb0e24645e 100644
--- a/backends/networking/curl/connectionmanager.cpp
+++ b/backends/networking/curl/connectionmanager.cpp
@@ -54,7 +54,7 @@ ConnectionManager::~ConnectionManager() {
delete request;
if (callback) (*callback)(request);
}
- _requests.clear();
+ _requests.clear();
//cleanup
curl_multi_cleanup(_multi);
@@ -68,9 +68,9 @@ void ConnectionManager::registerEasyHandle(CURL *easy) const {
}
Request *ConnectionManager::addRequest(Request *request, RequestCallback callback) {
- _addedRequestsMutex.lock();
+ _addedRequestsMutex.lock();
_addedRequests.push_back(RequestWithCallback(request, callback));
- if (!_timerStarted) startTimer();
+ if (!_timerStarted) startTimer();
_addedRequestsMutex.unlock();
return request;
}
@@ -130,7 +130,7 @@ void ConnectionManager::handle() {
++_frame;
if (_frame % CLOUD_PERIOD == 0) interateRequests();
if (_frame % CURL_PERIOD == 0) processTransfers();
-
+
if (_icon.draw() && _requests.empty() && !hasAddedRequests())
stopTimer();
_handleMutex.unlock();
@@ -148,7 +148,7 @@ void ConnectionManager::interateRequests() {
//call handle() of all running requests (so they can do their work)
debug(9, "handling %d request(s)", _requests.size());
for (Common::Array<RequestWithCallback>::iterator i = _requests.begin(); i != _requests.end();) {
- Request *request = i->request;
+ Request *request = i->request;
if (request) {
if (request->state() == PROCESSING) request->handle();
else if (request->state() == RETRY) request->handleRetry();
@@ -161,7 +161,7 @@ void ConnectionManager::interateRequests() {
continue;
}
- ++i;
+ ++i;
}
}
diff --git a/backends/networking/curl/connectionmanager.h b/backends/networking/curl/connectionmanager.h
index b4ecbc9d73..5fd19d78b5 100644
--- a/backends/networking/curl/connectionmanager.h
+++ b/backends/networking/curl/connectionmanager.h
@@ -71,17 +71,17 @@ class ConnectionManager : public Common::Singleton<ConnectionManager> {
struct RequestWithCallback {
Request *request;
RequestCallback onDeleteCallback;
-
+
RequestWithCallback(Request *rq = nullptr, RequestCallback cb = nullptr): request(rq), onDeleteCallback(cb) {}
};
- CURLM *_multi;
+ CURLM *_multi;
bool _timerStarted;
Common::Array<RequestWithCallback> _requests, _addedRequests;
Common::Mutex _handleMutex, _addedRequestsMutex;
CloudIcon _icon;
uint32 _frame;
-
+
void startTimer(int interval = TIMER_INTERVAL);
void stopTimer();
void handle();
diff --git a/backends/networking/curl/curljsonrequest.h b/backends/networking/curl/curljsonrequest.h
index 5a51065ca9..7858c89b80 100644
--- a/backends/networking/curl/curljsonrequest.h
+++ b/backends/networking/curl/curljsonrequest.h
@@ -50,7 +50,7 @@ public:
CurlJsonRequest(JsonCallback cb, ErrorCallback ecb, Common::String url);
virtual ~CurlJsonRequest();
- virtual void handle();
+ virtual void handle();
virtual void restart();
};
diff --git a/backends/networking/curl/curlrequest.cpp b/backends/networking/curl/curlrequest.cpp
index 05dfc4a362..4420b6f524 100644
--- a/backends/networking/curl/curlrequest.cpp
+++ b/backends/networking/curl/curlrequest.cpp
@@ -48,7 +48,7 @@ NetworkReadStream *CurlRequest::makeStream() {
}
void CurlRequest::handle() {
- if (!_stream) _stream = makeStream();
+ if (!_stream) _stream = makeStream();
if (_stream && _stream->eos()) {
if (_stream->httpResponseCode() != 200) {
@@ -68,7 +68,7 @@ void CurlRequest::restart() {
//with no stream available next handle() will create another one
}
-Common::String CurlRequest::date() const {
+Common::String CurlRequest::date() const {
if (_stream) {
Common::String headers = _stream->responseHeaders();
const char *cstr = headers.c_str();
@@ -114,7 +114,7 @@ void CurlRequest::addPostField(Common::String keyValuePair) {
void CurlRequest::addFormField(Common::String name, Common::String value) {
if (_bytesBuffer)
warning("CurlRequest: added POST form fields would be ignored, because there is buffer present");
-
+
if (_formFields.contains(name))
warning("CurlRequest: form field '%s' already had a value", name.c_str());
diff --git a/backends/networking/curl/networkreadstream.cpp b/backends/networking/curl/networkreadstream.cpp
index 9b34aaa3d5..d5f6288a26 100644
--- a/backends/networking/curl/networkreadstream.cpp
+++ b/backends/networking/curl/networkreadstream.cpp
@@ -29,13 +29,13 @@
namespace Networking {
-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) {
NetworkReadStream *stream = (NetworkReadStream *)p;
if (stream) return stream->write(d, n*l);
return 0;
}
-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) {
NetworkReadStream *stream = (NetworkReadStream *)p;
if (stream) return stream->fillWithSendingContents(d, n*l);
return 0;
@@ -79,7 +79,7 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, const byt
curl_easy_setopt(_easy, CURLOPT_READFUNCTION, curlReadDataCallback);
_sendingContentsBuffer = buffer;
_sendingContentsSize = bufferSize;
- } else if (usingPatch) {
+ } else if (usingPatch) {
curl_easy_setopt(_easy, CURLOPT_CUSTOMREQUEST, "PATCH");
} else {
if (post || bufferSize != 0) {
@@ -110,7 +110,7 @@ void NetworkReadStream::init(const char *url, curl_slist *headersList, Common::H
curl_easy_setopt(_easy, CURLOPT_NOPROGRESS, 0L);
curl_easy_setopt(_easy, CURLOPT_XFERINFOFUNCTION, curlProgressCallback);
curl_easy_setopt(_easy, CURLOPT_XFERINFODATA, this);
-
+
// set POST multipart upload form fields/files
struct curl_httppost *formpost = NULL;
struct curl_httppost *lastptr = NULL;
diff --git a/backends/networking/curl/networkreadstream.h b/backends/networking/curl/networkreadstream.h
index a3221011ec..0138da183b 100644
--- a/backends/networking/curl/networkreadstream.h
+++ b/backends/networking/curl/networkreadstream.h
@@ -34,7 +34,7 @@ struct curl_slist;
namespace Networking {
-class NetworkReadStream: public Common::MemoryReadWriteStream {
+class NetworkReadStream: public Common::MemoryReadWriteStream {
CURL *_easy;
bool _eos, _requestComplete;
const byte *_sendingContentsBuffer;