aboutsummaryrefslogtreecommitdiff
path: root/backends/networking/sdl_net
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/sdl_net
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/sdl_net')
-rw-r--r--backends/networking/sdl_net/client.cpp2
-rw-r--r--backends/networking/sdl_net/handlers/downloadfilehandler.cpp4
-rw-r--r--backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp2
-rw-r--r--backends/networking/sdl_net/handlers/filesbasehandler.cpp2
-rw-r--r--backends/networking/sdl_net/handlers/filespagehandler.cpp4
-rw-r--r--backends/networking/sdl_net/handlers/listajaxhandler.cpp2
-rw-r--r--backends/networking/sdl_net/handlers/uploadfilehandler.cpp2
-rw-r--r--backends/networking/sdl_net/handlers/uploadfilehandler.h2
-rw-r--r--backends/networking/sdl_net/localwebserver.cpp30
-rw-r--r--backends/networking/sdl_net/localwebserver.h2
-rw-r--r--backends/networking/sdl_net/reader.cpp2
-rw-r--r--backends/networking/sdl_net/uploadfileclienthandler.cpp4
12 files changed, 29 insertions, 29 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 23:51:28 +0000