From 9254df2d9614b2cc8e35a3abbdc593e54616a322 Mon Sep 17 00:00:00 2001 From: Peter Bozsó Date: Thu, 21 Jul 2016 09:29:54 +0200 Subject: CLOUD: Fix code formatting --- .../sdl_net/handlers/createdirectoryhandler.cpp | 3 +- .../sdl_net/handlers/filesajaxpagehandler.cpp | 4 +- backends/networking/sdl_net/handlerutils.cpp | 8 +- backends/networking/sdl_net/localwebserver.cpp | 92 +++++++++++----------- backends/networking/sdl_net/localwebserver.h | 2 +- backends/networking/sdl_net/reader.cpp | 2 +- .../networking/sdl_net/uploadfileclienthandler.cpp | 6 +- 7 files changed, 61 insertions(+), 56 deletions(-) (limited to 'backends/networking/sdl_net') diff --git a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp index 2ded9785a0..b16827dc58 100644 --- a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp +++ b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp @@ -91,9 +91,8 @@ void CreateDirectoryHandler::handle(Client &client) { client.queryParameter("path").c_str(), _("Back to parent directory") ), - (client.queryParameter("ajax") == "true" ? "/filesAJAX?path=" : "/files?path=") + - LocalWebserver::urlEncodeQueryParameterValue(client.queryParameter("path")) + LocalWebserver::urlEncodeQueryParameterValue(client.queryParameter("path")) ); } diff --git a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp index 7d48458d5e..6cf18aeb79 100644 --- a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp +++ b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp @@ -34,6 +34,7 @@ FilesAjaxPageHandler::FilesAjaxPageHandler() {} FilesAjaxPageHandler::~FilesAjaxPageHandler() {} namespace { + Common::String encodeDoubleQuotesAndSlashes(Common::String s) { Common::String result = ""; for (uint32 i = 0; i < s.size(); ++i) @@ -42,8 +43,9 @@ Common::String encodeDoubleQuotesAndSlashes(Common::String s) { } else if (s[i] == '\\') { result += "\\\\"; } else result += s[i]; - return result; + return result; } + } void FilesAjaxPageHandler::handle(Client &client) { diff --git a/backends/networking/sdl_net/handlerutils.cpp b/backends/networking/sdl_net/handlerutils.cpp index cdc505bfa9..bb6a036bdb 100644 --- a/backends/networking/sdl_net/handlerutils.cpp +++ b/backends/networking/sdl_net/handlerutils.cpp @@ -108,14 +108,16 @@ void HandlerUtils::setMessageHandler(Client &client, Common::String message, Com } void HandlerUtils::setFilesManagerErrorMessageHandler(Client &client, Common::String message, Common::String redirectTo) { - setMessageHandler(client, + setMessageHandler( + client, Common::String::format( "%s
%s", message.c_str(), - client.queryParameter("ajax") == "true" ? "AJAX": "", + client.queryParameter("ajax") == "true" ? "AJAX" : "", "%2F", //that's encoded "/" _("Back to the files manager") - ), redirectTo + ), + redirectTo ); } diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index 0ad1335f41..9b62bb8637 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -205,8 +205,11 @@ void LocalWebserver::handle() { void LocalWebserver::handleClient(uint32 i) { switch (_client[i].state()) { - case INVALID: return; - case READING_HEADERS: _client[i].readHeaders(); break; + case INVALID: + return; + case READING_HEADERS: + _client[i].readHeaders(); + break; case READ_HEADERS: //decide what to do next with that client //if GET, check whether we know a handler for such URL //if PUT, check whether we know a handler for that URL @@ -216,7 +219,6 @@ void LocalWebserver::handleClient(uint32 i) { (*_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 //fallthrough case BAD_REQUEST: @@ -278,55 +280,55 @@ void LocalWebserver::resolveAddress(void *ipAddress) { // if not - try platform-specific #ifdef POSIX - struct ifaddrs *ifAddrStruct = NULL; - void *tmpAddrPtr = NULL; + struct ifaddrs *ifAddrStruct = NULL; + void *tmpAddrPtr = NULL; - getifaddrs(&ifAddrStruct); + getifaddrs(&ifAddrStruct); - for (struct ifaddrs *i = ifAddrStruct; i != NULL; i = i->ifa_next) { - if (!i->ifa_addr) { - continue; - } + for (struct ifaddrs *i = ifAddrStruct; i != NULL; i = i->ifa_next) { + if (!i->ifa_addr) { + continue; + } - Common::String addr; + Common::String addr; - // IPv4 - 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; - } + // IPv4 + 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) { - tmpAddrPtr = &((struct sockaddr_in6 *)i->ifa_addr)->sin6_addr; - char addressBuffer[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN); - debug("%s IP Address %s", i->ifa_name, addressBuffer); - addr = addressBuffer; - } - */ + // IPv6 + /* + if (i->ifa_addr->sa_family == AF_INET6) { + tmpAddrPtr = &((struct sockaddr_in6 *)i->ifa_addr)->sin6_addr; + char addressBuffer[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN); + debug("%s IP Address %s", i->ifa_name, addressBuffer); + addr = addressBuffer; + } + */ - if (addr.empty()) continue; + if (addr.empty()) continue; - // ignored IPv4 addresses - if (addr.equals("127.0.0.1") || addr.equals("0.0.0.0") || addr.equals("localhost")) - continue; + // ignored IPv4 addresses + if (addr.equals("127.0.0.1") || addr.equals("0.0.0.0") || addr.equals("localhost")) + continue; - // ignored IPv6 addresses - /* - if (addr.equals("::1")) - continue; - */ + // ignored IPv6 addresses + /* + if (addr.equals("::1")) + continue; + */ - // use the address found - _address = "http://" + addr + Common::String::format(":%u/", _serverPort); - } + // use the address found + _address = "http://" + addr + Common::String::format(":%u/", _serverPort); + } - if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct); + if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct); #endif } @@ -397,9 +399,9 @@ Common::String LocalWebserver::urlDecode(Common::String value) { continue; } - if (value[i] == '%' && i+2 < size) { - int d1 = hexDigit(value[i+1]); - int d2 = hexDigit(value[i+2]); + if (value[i] == '%' && i + 2 < size) { + int d1 = hexDigit(value[i + 1]); + int d2 = hexDigit(value[i + 2]); if (0 <= d1 && d1 < 16 && 0 <= d2 && d2 < 16) { result += (char)(d1 * 16 + d2); i = i + 2; diff --git a/backends/networking/sdl_net/localwebserver.h b/backends/networking/sdl_net/localwebserver.h index d118509d62..f4c59c6b91 100644 --- a/backends/networking/sdl_net/localwebserver.h +++ b/backends/networking/sdl_net/localwebserver.h @@ -110,7 +110,7 @@ public: }; /** Shortcut for accessing the local webserver. */ -#define LocalServer Networking::LocalWebserver::instance() +#define LocalServer Networking::LocalWebserver::instance() } // End of namespace Networking diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp index 8edda70341..66efeec8cc 100644 --- a/backends/networking/sdl_net/reader.cpp +++ b/backends/networking/sdl_net/reader.cpp @@ -163,7 +163,7 @@ void Reader::parseFirstLine(const Common::String &headers) { const char *cstr = headers.c_str(); const char *position = strstr(cstr, "\r\n"); if (position) { //we have at least one line - and we want the first one - //" HTTP/\r\n" + //" HTTP/\r\n" Common::String method, path, http, buf; uint32 length = position - cstr; if (headersSize > length) headersSize = length; diff --git a/backends/networking/sdl_net/uploadfileclienthandler.cpp b/backends/networking/sdl_net/uploadfileclienthandler.cpp index 4ecd095c19..3c51c558a2 100644 --- a/backends/networking/sdl_net/uploadfileclienthandler.cpp +++ b/backends/networking/sdl_net/uploadfileclienthandler.cpp @@ -153,16 +153,16 @@ void UploadFileClientHandler::handleBlockContent(Client *client) { if (client->noMoreContent()) { // success - redirect back to directory listing - HandlerUtils::setMessageHandler(*client, + HandlerUtils::setMessageHandler( + *client, Common::String::format( "%s
%s", _("Uploaded successfully!"), client->queryParameter("path").c_str(), _("Back to parent directory") ), - (client->queryParameter("ajax") == "true" ? "/filesAJAX?path=" : "/files?path=") + - LocalWebserver::urlEncodeQueryParameterValue(client->queryParameter("path")) + LocalWebserver::urlEncodeQueryParameterValue(client->queryParameter("path")) ); _state = UFH_STOP; return; -- cgit v1.2.3