diff options
Diffstat (limited to 'backends/networking')
23 files changed, 58 insertions, 58 deletions
diff --git a/backends/networking/browser/openurl-android.cpp b/backends/networking/browser/openurl-android.cpp index 98fc803c0d..64e683238b 100644 --- a/backends/networking/browser/openurl-android.cpp +++ b/backends/networking/browser/openurl-android.cpp @@ -26,7 +26,7 @@ namespace Networking { namespace Browser { -bool openUrl(const Common::String &url) { +bool openUrl(const Common::String &url) { return JNI::openUrl(url.c_str()); } diff --git a/backends/networking/browser/openurl-posix.cpp b/backends/networking/browser/openurl-posix.cpp index 562c1ad53b..0e56119b4f 100644 --- a/backends/networking/browser/openurl-posix.cpp +++ b/backends/networking/browser/openurl-posix.cpp @@ -29,7 +29,7 @@ namespace Networking { namespace Browser { -namespace { +namespace { bool launch(const Common::String client, const Common::String &url) { // FIXME: system's input must be heavily escaped // well, when url's specified by user @@ -41,10 +41,10 @@ bool launch(const Common::String client, const Common::String &url) { bool openUrl(const Common::String &url) { // inspired by Qt's "qdesktopservices_x11.cpp" - + // try "standards" if (launch("xdg-open", url)) - return true; + return true; if (launch(getenv("DEFAULT_BROWSER"), url)) return true; if (launch(getenv("BROWSER"), url)) @@ -67,7 +67,7 @@ bool openUrl(const Common::String &url) { return true; if (launch("opera", url)) return true; - + warning("Networking::Browser::openUrl() (POSIX) failed to open URL"); return false; } 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; diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp index 9d49480334..6cef5ffc93 100644 --- a/backends/networking/sdl_net/client.cpp +++ b/backends/networking/sdl_net/client.cpp @@ -111,7 +111,7 @@ bool Client::readBlockContent(Common::WriteStream *stream) { return _reader.readBlockContent(stream); } -void Client::setHandler(ClientHandler *handler) { +void Client::setHandler(ClientHandler *handler) { if (_handler) { if (_previousHandler) delete _previousHandler; _previousHandler = _handler; //can't just delete it, as setHandler() could've been called by handler itself diff --git a/backends/networking/sdl_net/handlers/downloadfilehandler.cpp b/backends/networking/sdl_net/handlers/downloadfilehandler.cpp index ff45517979..20577de951 100644 --- a/backends/networking/sdl_net/handlers/downloadfilehandler.cpp +++ b/backends/networking/sdl_net/handlers/downloadfilehandler.cpp @@ -67,9 +67,9 @@ void DownloadFileHandler::handle(Client &client) { GetClientHandler *handler = new GetClientHandler(stream); handler->setResponseCode(200); - handler->setHeader("Content-Type", "application/force-download"); + handler->setHeader("Content-Type", "application/force-download"); handler->setHeader("Content-Disposition", "attachment; filename=\"" + node->getDisplayName() + "\""); - handler->setHeader("Content-Transfer-Encoding", "binary"); + handler->setHeader("Content-Transfer-Encoding", "binary"); client.setHandler(handler); } diff --git a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp index df4482166a..7d48458d5e 100644 --- a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp +++ b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp @@ -53,7 +53,7 @@ void FilesAjaxPageHandler::handle(Client &client) { HandlerUtils::setFilesManagerErrorMessageHandler(client, _("The page is not available without the resources.")); return; } - + Common::String response = HandlerUtils::readEverythingFromStream(stream); Common::String path = client.queryParameter("path"); diff --git a/backends/networking/sdl_net/handlers/filesbasehandler.cpp b/backends/networking/sdl_net/handlers/filesbasehandler.cpp index d4b5c3b9e8..9546c5c845 100644 --- a/backends/networking/sdl_net/handlers/filesbasehandler.cpp +++ b/backends/networking/sdl_net/handlers/filesbasehandler.cpp @@ -45,7 +45,7 @@ Common::String FilesBaseHandler::parentPath(Common::String path) { } bool FilesBaseHandler::transformPath(Common::String &path, Common::String &prefixToRemove, Common::String &prefixToAdd, bool isDirectory) { - // <path> is not empty, but could lack the trailing slash + // <path> is not empty, but could lack the trailing slash if (isDirectory && path.lastChar() != '/' && path.lastChar() != '\\') path += '/'; if (path.hasPrefix("/root")) { diff --git a/backends/networking/sdl_net/handlers/filespagehandler.cpp b/backends/networking/sdl_net/handlers/filespagehandler.cpp index 2e934a31c6..d3fa459aeb 100644 --- a/backends/networking/sdl_net/handlers/filespagehandler.cpp +++ b/backends/networking/sdl_net/handlers/filespagehandler.cpp @@ -66,7 +66,7 @@ Common::String getDisplayPath(Common::String s) { } void FilesPageHandler::handle(Client &client) { - Common::String response = + Common::String response = "<html>" \ "<head><title>ScummVM</title></head>" \ "<body>" \ @@ -97,7 +97,7 @@ void FilesPageHandler::handle(Client &client) { Common::String path = client.queryParameter("path"); Common::String content = ""; - + // show an error message if failed to list directory if (!listDirectory(path, content, itemTemplate)) { HandlerUtils::setFilesManagerErrorMessageHandler(client, _("ScummVM couldn't list the directory you specified.")); diff --git a/backends/networking/sdl_net/handlers/listajaxhandler.cpp b/backends/networking/sdl_net/handlers/listajaxhandler.cpp index 6319485e3d..2e2e138fd6 100644 --- a/backends/networking/sdl_net/handlers/listajaxhandler.cpp +++ b/backends/networking/sdl_net/handlers/listajaxhandler.cpp @@ -116,7 +116,7 @@ void ListAjaxHandler::addItem(Common::JSONArray &responseItemsList, ItemType ite default: icon = "unk.png"; } - Common::JSONObject item; + Common::JSONObject item; item.setVal("name", new Common::JSONValue(name)); item.setVal("path", new Common::JSONValue(path)); item.setVal("isDirectory", new Common::JSONValue(isDirectory)); diff --git a/backends/networking/sdl_net/handlers/uploadfilehandler.cpp b/backends/networking/sdl_net/handlers/uploadfilehandler.cpp index e2f6143474..5642e3f948 100644 --- a/backends/networking/sdl_net/handlers/uploadfilehandler.cpp +++ b/backends/networking/sdl_net/handlers/uploadfilehandler.cpp @@ -59,7 +59,7 @@ void UploadFileHandler::handle(Client &client) { HandlerUtils::setFilesManagerErrorMessageHandler(client, _("Can't upload into a file!")); return; } - + // if all OK, set special handler client.setHandler(new UploadFileClientHandler(path)); } diff --git a/backends/networking/sdl_net/handlers/uploadfilehandler.h b/backends/networking/sdl_net/handlers/uploadfilehandler.h index bba7fdfc02..4cd6115182 100644 --- a/backends/networking/sdl_net/handlers/uploadfilehandler.h +++ b/backends/networking/sdl_net/handlers/uploadfilehandler.h @@ -29,7 +29,7 @@ namespace Networking { class UploadFileHandler: public FilesBaseHandler { void handle(Client &client); - + public: UploadFileHandler(); virtual ~UploadFileHandler(); diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index baa2974aee..0ad1335f41 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -77,7 +77,7 @@ void LocalWebserver::startTimer(int interval) { } } -void LocalWebserver::stopTimer() { +void LocalWebserver::stopTimer() { Common::TimerManager *manager = g_system->getTimerManager(); manager->removeTimerProc(localWebserverTimer); _timerStarted = false; @@ -94,7 +94,7 @@ void LocalWebserver::start() { startTimer(); // Create a listening TCP socket - IPaddress ip; + IPaddress ip; if (SDLNet_ResolveHost(&ip, NULL, _serverPort) == -1) { error("SDLNet_ResolveHost: %s\n", SDLNet_GetError()); } @@ -113,9 +113,9 @@ void LocalWebserver::start() { // Create a socket set _set = SDLNet_AllocSocketSet(MAX_CONNECTIONS + 1); //one more for our server socket if (!_set) { - error("SDLNet_AllocSocketSet: %s\n", SDLNet_GetError()); + error("SDLNet_AllocSocketSet: %s\n", SDLNet_GetError()); } - + int numused = SDLNet_TCP_AddSocket(_set, _serverSocket); if (numused == -1) { error("SDLNet_AddSocket: %s\n", SDLNet_GetError()); @@ -193,7 +193,7 @@ void LocalWebserver::handle() { if (_clients == 0) ++_idlingFrames; else _idlingFrames = 0; - + if (_idlingFrames > FRAMES_PER_SECOND && _stopOnIdle) { _handleMutex.unlock(); stop(); @@ -203,7 +203,7 @@ void LocalWebserver::handle() { _handleMutex.unlock(); } -void LocalWebserver::handleClient(uint32 i) { +void LocalWebserver::handleClient(uint32 i) { switch (_client[i].state()) { case INVALID: return; case READING_HEADERS: _client[i].readHeaders(); break; @@ -214,7 +214,7 @@ void LocalWebserver::handleClient(uint32 i) { (*_pathHandlers[_client[i].path()])(_client[i]); else if (_defaultHandler) (*_defaultHandler)(_client[i]); //try default handler - + if (_client[i].state() == BEING_HANDLED || _client[i].state() == INVALID) break; //if no handler, answer with default BAD REQUEST @@ -287,18 +287,18 @@ void LocalWebserver::resolveAddress(void *ipAddress) { if (!i->ifa_addr) { continue; } - + Common::String addr; - + // IPv4 - if (i->ifa_addr->sa_family == AF_INET) { + if (i->ifa_addr->sa_family == AF_INET) { tmpAddrPtr = &((struct sockaddr_in *)i->ifa_addr)->sin_addr; char addressBuffer[INET_ADDRSTRLEN]; inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN); debug("%s IP Address %s", i->ifa_name, addressBuffer); addr = addressBuffer; } - + // IPv6 /* if (i->ifa_addr->sa_family == AF_INET6) { @@ -309,9 +309,9 @@ void LocalWebserver::resolveAddress(void *ipAddress) { addr = addressBuffer; } */ - + if (addr.empty()) continue; - + // ignored IPv4 addresses if (addr.equals("127.0.0.1") || addr.equals("0.0.0.0") || addr.equals("localhost")) continue; @@ -321,11 +321,11 @@ void LocalWebserver::resolveAddress(void *ipAddress) { if (addr.equals("::1")) continue; */ - + // use the address found _address = "http://" + addr + Common::String::format(":%u/", _serverPort); } - + if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct); #endif } diff --git a/backends/networking/sdl_net/localwebserver.h b/backends/networking/sdl_net/localwebserver.h index 9c677f36b0..d118509d62 100644 --- a/backends/networking/sdl_net/localwebserver.h +++ b/backends/networking/sdl_net/localwebserver.h @@ -82,7 +82,7 @@ class LocalWebserver : public Common::Singleton<LocalWebserver> { void handleClient(uint32 i); void acceptClient(); void resolveAddress(void *ipAddress); - + public: static const uint32 DEFAULT_SERVER_PORT = 12345; diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp index 1e5693c22f..8edda70341 100644 --- a/backends/networking/sdl_net/reader.cpp +++ b/backends/networking/sdl_net/reader.cpp @@ -230,7 +230,7 @@ void Reader::parseQueryParameters() { value = ""; } else key += _query[i]; } else { - if (_query[i] == '&') { + if (_query[i] == '&') { if (_queryParameters.contains(key)) warning("Query parameter \"%s\" is already set!", key.c_str()); else _queryParameters[key] = LocalWebserver::urlDecode(value); readingKey = true; diff --git a/backends/networking/sdl_net/uploadfileclienthandler.cpp b/backends/networking/sdl_net/uploadfileclienthandler.cpp index 7e93573ca5..4ecd095c19 100644 --- a/backends/networking/sdl_net/uploadfileclienthandler.cpp +++ b/backends/networking/sdl_net/uploadfileclienthandler.cpp @@ -164,11 +164,11 @@ void UploadFileClientHandler::handleBlockContent(Client *client) { (client->queryParameter("ajax") == "true" ? "/filesAJAX?path=" : "/files?path=") + LocalWebserver::urlEncodeQueryParameterValue(client->queryParameter("path")) ); - _state = UFH_STOP; + _state = UFH_STOP; return; } } - + // no more content avaiable if (client->noMoreContent()) { // if no file field was found - failure diff --git a/backends/networking/wwwroot/.filesAJAX.html b/backends/networking/wwwroot/.filesAJAX.html index f736b74b7e..d45c73069d 100644 --- a/backends/networking/wwwroot/.filesAJAX.html +++ b/backends/networking/wwwroot/.filesAJAX.html @@ -166,7 +166,7 @@ if (!slashes) { currentPath += crumb; b.appendChild(makeBreadcrumb(crumb, currentPath+'/')); - slashes = true; + slashes = true; } } else { if (slashes) { diff --git a/backends/networking/wwwroot/ajax.js b/backends/networking/wwwroot/ajax.js index 12c50f1e72..c01d7e93fc 100644 --- a/backends/networking/wwwroot/ajax.js +++ b/backends/networking/wwwroot/ajax.js @@ -6,7 +6,7 @@ ajax.x = function () { return new XMLHttpRequest(); }; // "no one uses IE6" ajax.send = function (url, callback, errorCallback, method, data, async) { if (async === undefined) async = true; - + var x = ajax.x(); x.open(method, url, async); x.onreadystatechange = function () { |