From 96cc5b34fe0151d2a1498eaaafb205757db346c4 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Wed, 14 Oct 2015 01:26:03 -0400
Subject: Use warningstream for log messages with WARNING

Remove DTIME macro and its uses, too
---
 src/mapblock.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/mapblock.cpp')

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 942457407..be16c3bb7 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -707,7 +707,7 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
 				&m_node_metadata, &m_node_timers,
 				m_gamedef->idef());
 	} catch(SerializationError &e) {
-		errorstream<<"WARNING: MapBlock::deSerialize(): Ignoring an error"
+		warningstream<<"MapBlock::deSerialize(): Ignoring an error"
 				<<" while deserializing node metadata at ("
 				<<PP(getPos())<<": "<<e.what()<<std::endl;
 	}
@@ -770,7 +770,7 @@ void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 	}
 	catch(SerializationError &e)
 	{
-		errorstream<<"WARNING: MapBlock::deSerializeNetworkSpecific(): Ignoring an error"
+		warningstream<<"MapBlock::deSerializeNetworkSpecific(): Ignoring an error"
 				<<": "<<e.what()<<std::endl;
 	}
 }
@@ -797,12 +797,12 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 		is.read(&tmp, 1);
 		if (is.gcount() != 1)
 			throw SerializationError(std::string(__FUNCTION_NAME)
-				+ ": no enough input data");
+				+ ": not enough input data");
 		is_underground = tmp;
 		is.read((char *)*databuf_nodelist, nodecount * ser_length);
 		if ((u32)is.gcount() != nodecount * ser_length)
 			throw SerializationError(std::string(__FUNCTION_NAME)
-				+ ": no enough input data");
+				+ ": not enough input data");
 	} else if (version <= 10) {
 		u8 t8;
 		is.read((char *)&t8, 1);
@@ -815,7 +815,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 			std::string s = os.str();
 			if (s.size() != nodecount)
 				throw SerializationError(std::string(__FUNCTION_NAME)
-					+ ": no enough input data");
+					+ ": not enough input data");
 			for (u32 i = 0; i < s.size(); i++) {
 				databuf_nodelist[i*ser_length] = s[i];
 			}
@@ -827,7 +827,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 			std::string s = os.str();
 			if (s.size() != nodecount)
 				throw SerializationError(std::string(__FUNCTION_NAME)
-					+ ": no enough input data");
+					+ ": not enough input data");
 			for (u32 i = 0; i < s.size(); i++) {
 				databuf_nodelist[i*ser_length + 1] = s[i];
 			}
@@ -840,7 +840,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 			std::string s = os.str();
 			if (s.size() != nodecount)
 				throw SerializationError(std::string(__FUNCTION_NAME)
-					+ ": no enough input data");
+					+ ": not enough input data");
 			for (u32 i = 0; i < s.size(); i++) {
 				databuf_nodelist[i*ser_length + 2] = s[i];
 			}
@@ -891,7 +891,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 						m_gamedef->idef());
 				}
 			} catch(SerializationError &e) {
-				errorstream<<"WARNING: MapBlock::deSerialize(): Ignoring an error"
+				warningstream<<"MapBlock::deSerialize(): Ignoring an error"
 						<<" while deserializing node metadata"<<std::endl;
 			}
 		}
@@ -910,7 +910,7 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 			u16 count = readU16(is);
 			// Not supported and length not known if count is not 0
 			if(count != 0){
-				errorstream<<"WARNING: MapBlock::deSerialize_pre22(): "
+				warningstream<<"MapBlock::deSerialize_pre22(): "
 						<<"Ignoring stuff coming at and after MBOs"<<std::endl;
 				return;
 			}
-- 
cgit v1.2.3