ALL: Fix debug, warning and error usage

Added prefixes, used debug(9).

3 files changed, 19 insertions, 19 deletions

diff --git a/backends/networking/sdl_net/client.cpp b/backends/networking/sdl_net/client.cpp
index 0026d0e346..dab38ba5c0 100644
--- a/backends/networking/sdl_net/client.cpp
+++ b/backends/networking/sdl_net/client.cpp
@@ -62,7 +62,7 @@ void Client::open(SDLNet_SocketSet set, TCPsocket socket) {
 	if (set) {
 		int numused = SDLNet_TCP_AddSocket(set, socket);
 		if (numused == -1) {
-			error("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+			error("Client: SDLNet_AddSocket: %s\n", SDLNet_GetError());
 		}
 	}
 }
@@ -79,13 +79,13 @@ bool Client::readMoreIfNeeded() {
 
 	int bytes = SDLNet_TCP_Recv(_socket, _buffer, CLIENT_BUFFER_SIZE);
 	if (bytes <= 0) {
-		warning("Client::readHeaders recv fail");
+		warning("Client::readMoreIfNeeded: recv fail");
 		close();
 		return false;
 	}
 
 	if (_stream->write(_buffer, bytes) != bytes) {
-		warning("failed to write() into MemoryReadWriteStream");
+		warning("Client::readMoreIfNeeded: failed to write() into MemoryReadWriteStream");
 		close();
 		return false;
 	}
@@ -146,7 +146,7 @@ void Client::close() {
 		if (_socket) {
 			int numused = SDLNet_TCP_DelSocket(_set, _socket);
 			if (numused == -1)
-				error("SDLNet_DelSocket: %s\n", SDLNet_GetError());
+				error("Client: SDLNet_DelSocket: %s\n", SDLNet_GetError());
 		}
 		_set = nullptr;
 	}
diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp
index 75dbea0d56..8a40aed697 100644
--- a/backends/networking/sdl_net/localwebserver.cpp
+++ b/backends/networking/sdl_net/localwebserver.cpp
@@ -96,14 +96,14 @@ void LocalWebserver::start() {
 	// Create a listening TCP socket
 	IPaddress ip;
 	if (SDLNet_ResolveHost(&ip, NULL, _serverPort) == -1) {
-		error("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+		error("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
 	}
 
 	resolveAddress(&ip);
 
 	_serverSocket = SDLNet_TCP_Open(&ip);
 	if (!_serverSocket) {
-		warning("SDLNet_TCP_Open: %s", SDLNet_GetError());
+		warning("LocalWebserver: SDLNet_TCP_Open: %s", SDLNet_GetError());
 		stopTimer();
 		g_system->displayMessageOnOSD(_("Failed to start local webserver.\nCheck whether selected port is not used by another application and try again."));
 		_handleMutex.unlock();
@@ -113,12 +113,12 @@ 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("LocalWebserver: SDLNet_AllocSocketSet: %s\n", SDLNet_GetError());
 	}
 
 	int numused = SDLNet_TCP_AddSocket(_set, _serverSocket);
 	if (numused == -1) {
-		error("SDLNet_AddSocket: %s\n", SDLNet_GetError());
+		error("LocalWebserver: SDLNet_AddSocket: %s\n", SDLNet_GetError());
 	}
 	_handleMutex.unlock();
 }
@@ -183,7 +183,7 @@ void LocalWebserver::handle() {
 	_handleMutex.lock();
 	int numready = SDLNet_CheckSockets(_set, 0);
 	if (numready == -1) {
-		error("SDLNet_CheckSockets: %s\n", SDLNet_GetError());
+		error("LocalWebserver: SDLNet_CheckSockets: %s\n", SDLNet_GetError());
 	} else if (numready) {
 		acceptClient();
 	}
@@ -268,11 +268,11 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 	// default way (might work everywhere, surely works on Windows)
 	const char *name = SDLNet_ResolveIP(ip);
 	if (name == NULL) {
-		warning("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+		warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
 	} else {
 		IPaddress localIp;
 		if (SDLNet_ResolveHost(&localIp, name, _serverPort) == -1) {
-			warning("SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+			warning("LocalWebserver: SDLNet_ResolveHost: %s\n", SDLNet_GetError());
 		} else {
 			_address = Common::String::format(
 				"http://%u.%u.%u.%u:%u/",
@@ -284,7 +284,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 
 	// check that our trick worked
 	if (_address.contains("/127.0.0.1:") || _address.contains("localhost") || _address.contains("/0.0.0.0:"))
-		warning("Failed to resolve IP with the default way");
+		warning("LocalWebserver: Failed to resolve IP with the default way");
 	else
 		return;
 
@@ -307,7 +307,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 			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);
+			debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
 			addr = addressBuffer;
 		}
 
@@ -317,7 +317,7 @@ void LocalWebserver::resolveAddress(void *ipAddress) {
 			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);
+			debug(9, "%s IP Address %s", i->ifa_name, addressBuffer);
 			addr = addressBuffer;
 		}
 		*/
diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp
index 828f583003..0e4cc9a106 100644
--- a/backends/networking/sdl_net/reader.cpp
+++ b/backends/networking/sdl_net/reader.cpp
@@ -138,7 +138,7 @@ void readFromThatUntilLineEnd(const char *cstr, Common::String needle, Common::S
 
 void Reader::handleFirstHeaders(Common::String headers) {
 	if (!_boundary.empty()) {
-		warning("handleFirstHeaders() called when first headers were already handled");
+		warning("Reader: handleFirstHeaders() called when first headers were already handled");
 		return;
 	}
 
@@ -252,7 +252,7 @@ void Reader::parseQueryParameters() {
 		} else {
 			if (_query[i] == '&') {
 				if (_queryParameters.contains(key))
-					warning("Query parameter \"%s\" is already set!", key.c_str());
+					warning("Reader: query parameter \"%s\" is already set!", key.c_str());
 				else
 					_queryParameters[key] = LocalWebserver::urlDecode(value);
 				readingKey = true;
@@ -265,7 +265,7 @@ void Reader::parseQueryParameters() {
 
 	if (!key.empty()) {
 		if (_queryParameters.contains(key))
-			warning("Query parameter \"%s\" is already set!", key.c_str());
+			warning("Reader: query parameter \"%s\" is already set!", key.c_str());
 		else
 			_queryParameters[key] = LocalWebserver::urlDecode(value);
 	}
@@ -410,9 +410,9 @@ bool Reader::readBlockContent(Common::WriteStream *stream) {
 		if (bts == "--")
 			_allContentRead = true;
 		else if (bts != "\r\n")
-			warning("strange bytes: \"%s\"", bts.c_str());
+			warning("Reader: strange bytes: \"%s\"", bts.c_str());
 	} else {
-		warning("strange ending");
+		warning("Reader: strange ending");
 		_allContentRead = true;
 	}