From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 10 Mar 2012 15:02:14 +0000 (+0200)
Subject: Clean unit test output
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=d81e783665e1621b37bacaf66e13d11fdfbbbd94;p=zefram%2Fminetest%2Fminetest_engine.git

Clean unit test output
---

diff --git a/src/test.cpp b/src/test.cpp
index 45851a7e..6588f113 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -1184,8 +1184,10 @@ struct TestConnection
 
 			infostream<<"Sending data (size="<<datasize<<"):";
 			for(int i=0; i<datasize && i<20; i++){
-				if(i%2==0) DEBUGPRINT(" ");
-				DEBUGPRINT("%.2X", ((int)((const char*)*data1)[i])&0xff);
+				if(i%2==0) infostream<<" ";
+				char buf[10];
+				snprintf(buf, 10, "%.2X", ((int)((const char*)*data1)[i])&0xff);
+				infostream<<buf;
 			}
 			if(datasize>20)
 				infostream<<"...";
@@ -1216,10 +1218,12 @@ struct TestConnection
 					<<", size="<<size
 					<<std::endl;
 
-			infostream<<"Received data (size="<<size<<"):";
+			infostream<<"Received data (size="<<size<<"): ";
 			for(int i=0; i<size && i<20; i++){
-				if(i%2==0) DEBUGPRINT(" ");
-				DEBUGPRINT("%.2X", ((int)(recvdata[i]))&0xff);
+				if(i%2==0) infostream<<" ";
+				char buf[10];
+				snprintf(buf, 10, "%.2X", ((int)(recvdata[i]))&0xff);
+				infostream<<buf;
 			}
 			if(size>20)
 				infostream<<"...";
diff --git a/src/voxel.h b/src/voxel.h
index 46864e06..291b51e0 100644
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -364,11 +364,11 @@ public:
 
 		if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
 		{
-			dstream<<"EXCEPT: VoxelManipulator::getNode(): "
+			/*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
 					<<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
 					<<", index="<<m_area.index(p)
 					<<", flags="<<(int)m_flags[m_area.index(p)]
-					<<" is inexistent"<<std::endl;
+					<<" is inexistent"<<std::endl;*/
 			throw InvalidPositionException
 			("VoxelManipulator: getNode: inexistent");
 		}
@@ -400,11 +400,11 @@ public:
 
 		if(m_flags[m_area.index(p)] & VOXELFLAG_INEXISTENT)
 		{
-			dstream<<"EXCEPT: VoxelManipulator::getNode(): "
+			/*dstream<<"EXCEPT: VoxelManipulator::getNode(): "
 					<<"p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"
 					<<", index="<<m_area.index(p)
 					<<", flags="<<(int)m_flags[m_area.index(p)]
-					<<" is inexistent"<<std::endl;
+					<<" is inexistent"<<std::endl;*/
 			throw InvalidPositionException
 			("VoxelManipulator: getNode: inexistent");
 		}