Clean up util/serialization.{cpp,h} and add unit tests

3 files changed, 315 insertions, 268 deletions

diff --git a/src/unittest/test_serialization.cpp b/src/unittest/test_serialization.cpp
index b180df54e..7e58dadca 100644
--- a/src/unittest/test_serialization.cpp
+++ b/src/unittest/test_serialization.cpp
@@ -38,10 +38,14 @@ public:
 	void testDeSerializeString();
 	void testDeSerializeWideString();
 	void testDeSerializeLongString();
+	void testStreamRead();
+	void testStreamWrite();
 
 	std::string teststring2;
 	std::wstring teststring2_w;
 	std::string teststring2_w_encoded;
+
+	static const u8 test_serialized_data[12 * 13];
 };
 
 static TestSerialization g_test_instance;
@@ -58,6 +62,8 @@ void TestSerialization::runTests(IGameDef *gamedef)
 	TEST(testDeSerializeLongString);
 	TEST(testSerializeJsonString);
 	TEST(testSerializeHex);
+	TEST(testStreamRead);
+	TEST(testStreamWrite);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -271,3 +277,117 @@ void TestSerialization::testSerializeHex()
 	UASSERT(serializeHexString(mkstr("\x00\x0a\xb0\x63\x1f\x00\xff"), true) ==
 		"00 0a b0 63 1f 00 ff");
 }
+
+
+void TestSerialization::testStreamRead()
+{
+	std::string datastr(
+		(const char *)test_serialized_data,
+		sizeof(test_serialized_data));
+	std::istringstream is(datastr, std::ios_base::binary);
+
+	UASSERT(readU8(is) == 0x11);
+	UASSERT(readU16(is) == 0x2233);
+	UASSERT(readU32(is) == 0x44556677);
+	UASSERT(readU64(is) == 0x8899AABBCCDDEEFF);
+
+	UASSERT(readS8(is) == -128);
+	UASSERT(readS16(is) == 30000);
+	UASSERT(readS32(is) == -6);
+	UASSERT(readS64(is) == -43);
+
+	UASSERT(fabs(readF1000(is) - 53.534f) < 0.005);
+	UASSERT(fabs(readF1000(is) - -300000.32f) < 0.05);
+	UASSERT(fabs(readF1000(is) - -2147483.f) < 0.05);
+	UASSERT(fabs(readF1000(is) - 2147483.f) < 0.05);
+
+	UASSERT(deSerializeString(is) == "foobar!");
+
+	UASSERT(readV2S16(is) == v2s16(500, 500));
+	UASSERT(readV3S16(is) == v3s16(4207, 604, -30));
+	UASSERT(readV2S32(is) == v2s32(1920, 1080));
+	UASSERT(readV3S32(is) == v3s32(-400, 6400054, 290549855));
+
+	v2f vec2 = readV2F1000(is);
+	UASSERT(fabs(vec2.X - 500.656f) < 0.005);
+	UASSERT(fabs(vec2.Y - 350.345f) < 0.005);
+
+	UASSERT(deSerializeWideString(is) == L"\x02~woof~\x5455");
+
+	v3f vec3 = readV3F1000(is);
+	UASSERT(fabs(vec3.X - 500.f) < 0.005);
+	UASSERT(fabs(vec3.Y - 10024.2f) < 0.005);
+	UASSERT(fabs(vec3.Z - -192.54f) < 0.005);
+
+	UASSERT(readARGB8(is) == video::SColor(255, 128, 50, 128));
+
+	UASSERT(deSerializeLongString(is) == "some longer string here");
+
+	UASSERT(is.rdbuf()->in_avail() == 2);
+	UASSERT(readU16(is) == 0xF00D);
+	UASSERT(is.rdbuf()->in_avail() == 0);
+}
+
+
+void TestSerialization::testStreamWrite()
+{
+	std::ostringstream os(std::ios_base::binary);
+	std::string data;
+
+	writeU8(os, 0x11);
+	writeU16(os, 0x2233);
+	writeU32(os, 0x44556677);
+	writeU64(os, 0x8899AABBCCDDEEFF);
+
+	writeS8(os, -128);
+	writeS16(os, 30000);
+	writeS32(os, -6);
+	writeS64(os, -43);
+
+	writeF1000(os, 53.53467f);
+	writeF1000(os, -300000.32f);
+	writeF1000(os, -2147483.f);
+	writeF1000(os, 2147483.f);
+
+	os << serializeString("foobar!");
+
+	data = os.str();
+	UASSERT(data.size() < sizeof(test_serialized_data));
+	UASSERT(!memcmp(&data[0], test_serialized_data, data.size()));
+
+	writeV2S16(os, v2s16(500, 500));
+	writeV3S16(os, v3s16(4207, 604, -30));
+	writeV2S32(os, v2s32(1920, 1080));
+	writeV3S32(os, v3s32(-400, 6400054, 290549855));
+	writeV2F1000(os, v2f(500.65661f, 350.34567f));
+
+	os << serializeWideString(L"\x02~woof~\x5455");
+
+	writeV3F1000(os, v3f(500, 10024.2f, -192.54f));
+	writeARGB8(os, video::SColor(255, 128, 50, 128));
+
+	os << serializeLongString("some longer string here");
+
+	writeU16(os, 0xF00D);
+
+	data = os.str();
+	UASSERT(data.size() == sizeof(test_serialized_data));
+	UASSERT(!memcmp(&data[0], test_serialized_data, sizeof(test_serialized_data)));
+}
+
+
+const u8 TestSerialization::test_serialized_data[12 * 13] = {
+	0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc,
+	0xdd, 0xee, 0xff, 0x80, 0x75, 0x30, 0xff, 0xff, 0xff, 0xfa, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xd5, 0x00, 0x00, 0xd1, 0x1e, 0xee, 0x1e,
+	0x5b, 0xc0, 0x80, 0x00, 0x02, 0x80, 0x7F, 0xFF, 0xFD, 0x80, 0x00, 0x07,
+	0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x21, 0x01, 0xf4, 0x01, 0xf4, 0x10,
+	0x6f, 0x02, 0x5c, 0xff, 0xe2, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x04,
+	0x38, 0xff, 0xff, 0xfe, 0x70, 0x00, 0x61, 0xa8, 0x36, 0x11, 0x51, 0x70,
+	0x5f, 0x00, 0x07, 0xa3, 0xb0, 0x00, 0x05, 0x58, 0x89, 0x00, 0x08, 0x00,
+	0x02, 0x00, 0x7e, 0x00, 0x77, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x66, 0x00,
+	0x7e, 0x54, 0x55, 0x00, 0x07, 0xa1, 0x20, 0x00, 0x98, 0xf5, 0x08, 0xff,
+	0xfd, 0x0f, 0xe4, 0xff, 0x80, 0x32, 0x80, 0x00, 0x00, 0x00, 0x17, 0x73,
+	0x6f, 0x6d, 0x65, 0x20, 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x73,
+	0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x68, 0x65, 0x72, 0x65, 0xF0, 0x0D,
+};
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
index 0d38b9608..c0168776e 100644
--- a/src/util/serialize.cpp
+++ b/src/util/serialize.cpp
@@ -37,7 +37,7 @@ std::string serializeString(const std::string &plain)
 	std::string s;
 	char buf[2];
 
-	if (plain.size() > 65535)
+	if (plain.size() > STRING_MAX_LEN)
 		throw SerializationError("String too long for serializeString");
 
 	writeU16((u8 *)&buf[0], plain.size());
@@ -79,8 +79,8 @@ std::string serializeWideString(const std::wstring &plain)
 	std::string s;
 	char buf[2];
 
-	if (plain.size() > 65535)
-		throw SerializationError("String too long for serializeString");
+	if (plain.size() > WIDE_STRING_MAX_LEN)
+		throw SerializationError("String too long for serializeWideString");
 
 	writeU16((u8 *)buf, plain.size());
 	s.append(buf, 2);
@@ -99,7 +99,7 @@ std::wstring deSerializeWideString(std::istream &is)
 
 	is.read(buf, 2);
 	if (is.gcount() != 2)
-		throw SerializationError("deSerializeString: size not read");
+		throw SerializationError("deSerializeWideString: size not read");
 
 	u16 s_size = readU16((u8 *)buf);
 	if (s_size == 0)
@@ -127,7 +127,7 @@ std::string serializeLongString(const std::string &plain)
 {
 	char buf[4];
 
-	if (plain.size() > LONG_STRING_MAX)
+	if (plain.size() > LONG_STRING_MAX_LEN)
 		throw SerializationError("String too long for serializeLongString");
 
 	writeU32((u8*)&buf[0], plain.size());
@@ -151,7 +151,7 @@ std::string deSerializeLongString(std::istream &is)
 		return s;
 
 	// We don't really want a remote attacker to force us to allocate 4GB...
-	if (s_size > LONG_STRING_MAX) {
+	if (s_size > LONG_STRING_MAX_LEN) {
 		throw SerializationError("deSerializeLongString: "
 			"string too long: " + itos(s_size) + " bytes");
 	}
@@ -159,7 +159,7 @@ std::string deSerializeLongString(std::istream &is)
 	Buffer<char> buf2(s_size);
 	is.read(&buf2[0], s_size);
 	if (is.gcount() != s_size)
-		throw SerializationError("deSerializeString: couldn't read all chars");
+		throw SerializationError("deSerializeLongString: couldn't read all chars");
 
 	s.reserve(s_size);
 	s.append(&buf2[0], s_size);
diff --git a/src/util/serialize.h b/src/util/serialize.h
index 60f25d740..67b10d8fb 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -32,183 +32,144 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define FIXEDPOINT_FACTOR 1000.0f
 #define FIXEDPOINT_INVFACTOR (1.0f/FIXEDPOINT_FACTOR)
 
+#define STRING_MAX_LEN 0xFFFF
+#define WIDE_STRING_MAX_LEN 0xFFFF
+// 64 MB ought to be enough for anybody - Billy G.
+#define LONG_STRING_MAX_LEN (64 * 1024 * 1024)
+
+
 #if HAVE_ENDIAN_H
 // use machine native byte swapping routines
 // Note: memcpy below is optimized out by modern compilers
 
-inline void writeU64(u8* data, u64 i)
-{
-	u64 val = htobe64(i);
-	memcpy(data, &val, 8);
-}
-
-inline void writeU32(u8* data, u32 i)
+inline u16 readU16(const u8 *data)
 {
-	u32 val = htobe32(i);
-	memcpy(data, &val, 4);
+	u16 val;
+	memcpy(&val, data, 2);
+	return be16toh(val);
 }
 
-inline void writeU16(u8* data, u16 i)
+inline u32 readU32(const u8 *data)
 {
-	u16 val = htobe16(i);
-	memcpy(data, &val, 2);
+	u32 val;
+	memcpy(&val, data, 4);
+	return be32toh(val);
 }
 
-inline u64 readU64(const u8* data)
+inline u64 readU64(const u8 *data)
 {
 	u64 val;
 	memcpy(&val, data, 8);
 	return be64toh(val);
 }
 
-inline u32 readU32(const u8* data)
+inline void writeU16(u8 *data, u16 i)
 {
-	u32 val;
-	memcpy(&val, data, 4);
-	return be32toh(val);
+	u16 val = htobe16(i);
+	memcpy(data, &val, 2);
 }
 
-inline u16 readU16(const u8* data)
+inline void writeU32(u8 *data, u32 i)
 {
-	u16 val;
-	memcpy(&val, data, 2);
-	return be16toh(val);
+	u32 val = htobe32(i);
+	memcpy(data, &val, 4);
 }
 
-#else
-// generic byte-swapping implementation
-
 inline void writeU64(u8 *data, u64 i)
 {
-	data[0] = ((i>>56)&0xff);
-	data[1] = ((i>>48)&0xff);
-	data[2] = ((i>>40)&0xff);
-	data[3] = ((i>>32)&0xff);
-	data[4] = ((i>>24)&0xff);
-	data[5] = ((i>>16)&0xff);
-	data[6] = ((i>> 8)&0xff);
-	data[7] = ((i>> 0)&0xff);
+	u64 val = htobe64(i);
+	memcpy(data, &val, 8);
 }
 
-inline void writeU32(u8 *data, u32 i)
+#else
+// generic byte-swapping implementation
+
+inline u16 readU16(const u8 *data)
 {
-	data[0] = ((i>>24)&0xff);
-	data[1] = ((i>>16)&0xff);
-	data[2] = ((i>> 8)&0xff);
-	data[3] = ((i>> 0)&0xff);
+	return
+		((u16)data[0] << 8) | ((u16)data[1] << 0);
 }
 
-inline void writeU16(u8 *data, u16 i)
+inline u32 readU32(const u8 *data)
 {
-	data[0] = ((i>> 8)&0xff);
-	data[1] = ((i>> 0)&0xff);
+	return
+		((u32)data[0] << 24) | ((u32)data[1] << 16) |
+		((u32)data[2] <<  8) | ((u32)data[3] <<  0);
 }
 
 inline u64 readU64(const u8 *data)
 {
-	return ((u64)data[0]<<56) | ((u64)data[1]<<48)
-		| ((u64)data[2]<<40) | ((u64)data[3]<<32)
-		| ((u64)data[4]<<24) | ((u64)data[5]<<16)
-		| ((u64)data[6]<<8) | ((u64)data[7]<<0);
+	return
+		((u64)data[0] << 56) | ((u64)data[1] << 48) |
+		((u64)data[2] << 40) | ((u64)data[3] << 32) |
+		((u64)data[4] << 24) | ((u64)data[5] << 16) |
+		((u64)data[6] <<  8) | ((u64)data[7] << 0);
 }
 
-inline u32 readU32(const u8 *data)
+inline void writeU16(u8 *data, u16 i)
 {
-	return (data[0]<<24) | (data[1]<<16) | (data[2]<<8) | (data[3]<<0);
+	data[0] = (i >> 8) & 0xFF;
+	data[1] = (i >> 0) & 0xFF;
 }
 
-inline u16 readU16(const u8 *data)
+inline void writeU32(u8 *data, u32 i)
 {
-	return (data[0]<<8) | (data[1]<<0);
+	data[0] = (i >> 24) & 0xFF;
+	data[1] = (i >> 16) & 0xFF;
+	data[2] = (i >>  8) & 0xFF;
+	data[3] = (i >>  0) & 0xFF;
 }
 
-#endif
-
-inline void writeU8(u8 *data, u8 i)
+inline void writeU64(u8 *data, u64 i)
 {
-	data[0] = ((i>> 0)&0xff);
+	data[0] = (i >> 56) & 0xFF;
+	data[1] = (i >> 48) & 0xFF;
+	data[2] = (i >> 40) & 0xFF;
+	data[3] = (i >> 32) & 0xFF;
+	data[4] = (i >> 24) & 0xFF;
+	data[5] = (i >> 16) & 0xFF;
+	data[6] = (i >>  8) & 0xFF;
+	data[7] = (i >>  0) & 0xFF;
 }
 
-inline u8 readU8(const u8 *data)
-{
-	return (data[0]<<0);
-}
+#endif // HAVE_ENDIAN_H
 
-inline void writeS32(u8 *data, s32 i){
-	writeU32(data, (u32)i);
-}
-inline s32 readS32(const u8 *data){
-	return (s32)readU32(data);
-}
+//////////////// read routines ////////////////
 
-inline void writeS16(u8 *data, s16 i){
-	writeU16(data, (u16)i);
-}
-inline s16 readS16(const u8 *data){
-	return (s16)readU16(data);
+inline u8 readU8(const u8 *data)
+{
+	return ((u8)data[0] << 0);
 }
 
-inline void writeS8(u8 *data, s8 i){
-	writeU8(data, (u8)i);
-}
-inline s8 readS8(const u8 *data){
+inline s8 readS8(const u8 *data)
+{
 	return (s8)readU8(data);
 }
 
-inline void writeF1000(u8 *data, f32 i){
-	writeS32(data, i*FIXEDPOINT_FACTOR);
-}
-inline f32 readF1000(const u8 *data){
-	return (f32)readS32(data)*FIXEDPOINT_INVFACTOR;
-}
-
-inline void writeV3S32(u8 *data, v3s32 p)
+inline s16 readS16(const u8 *data)
 {
-	writeS32(&data[0], p.X);
-	writeS32(&data[4], p.Y);
-	writeS32(&data[8], p.Z);
-}
-inline v3s32 readV3S32(const u8 *data)
-{
-	v3s32 p;
-	p.X = readS32(&data[0]);
-	p.Y = readS32(&data[4]);
-	p.Z = readS32(&data[8]);
-	return p;
+	return (s16)readU16(data);
 }
 
-inline void writeV3F1000(u8 *data, v3f p)
+inline s32 readS32(const u8 *data)
 {
-	writeF1000(&data[0], p.X);
-	writeF1000(&data[4], p.Y);
-	writeF1000(&data[8], p.Z);
-}
-inline v3f readV3F1000(const u8 *data)
-{
-	v3f p;
-	p.X = (float)readF1000(&data[0]);
-	p.Y = (float)readF1000(&data[4]);
-	p.Z = (float)readF1000(&data[8]);
-	return p;
+	return (s32)readU32(data);
 }
 
-inline void writeV2F1000(u8 *data, v2f p)
+inline s64 readS64(const u8 *data)
 {
-	writeF1000(&data[0], p.X);
-	writeF1000(&data[4], p.Y);
+	return (s64)readU64(data);
 }
-inline v2f readV2F1000(const u8 *data)
+
+inline f32 readF1000(const u8 *data)
 {
-	v2f p;
-	p.X = (float)readF1000(&data[0]);
-	p.Y = (float)readF1000(&data[4]);
-	return p;
+	return (f32)readS32(data) * FIXEDPOINT_INVFACTOR;
 }
 
-inline void writeV2S16(u8 *data, v2s16 p)
+inline video::SColor readARGB8(const u8 *data)
 {
-	writeS16(&data[0], p.X);
-	writeS16(&data[2], p.Y);
+	video::SColor p(readU32(data));
+	return p;
 }
 
 inline v2s16 readV2S16(const u8 *data)
@@ -219,10 +180,13 @@ inline v2s16 readV2S16(const u8 *data)
 	return p;
 }
 
-inline void writeV2S32(u8 *data, v2s32 p)
+inline v3s16 readV3S16(const u8 *data)
 {
-	writeS32(&data[0], p.X);
-	writeS32(&data[4], p.Y);
+	v3s16 p;
+	p.X = readS16(&data[0]);
+	p.Y = readS16(&data[2]);
+	p.Z = readS16(&data[4]);
+	return p;
 }
 
 inline v2s32 readV2S32(const u8 *data)
@@ -233,201 +197,165 @@ inline v2s32 readV2S32(const u8 *data)
 	return p;
 }
 
-inline void writeV3S16(u8 *data, v3s16 p)
-{
-	writeS16(&data[0], p.X);
-	writeS16(&data[2], p.Y);
-	writeS16(&data[4], p.Z);
-}
-
-inline v3s16 readV3S16(const u8 *data)
+inline v3s32 readV3S32(const u8 *data)
 {
-	v3s16 p;
-	p.X = readS16(&data[0]);
-	p.Y = readS16(&data[2]);
-	p.Z = readS16(&data[4]);
+	v3s32 p;
+	p.X = readS32(&data[0]);
+	p.Y = readS32(&data[4]);
+	p.Z = readS32(&data[8]);
 	return p;
 }
 
-inline void writeARGB8(u8 *data, video::SColor p)
+inline v2f readV2F1000(const u8 *data)
 {
-	writeU32(data, p.color);
+	v2f p;
+	p.X = (float)readF1000(&data[0]);
+	p.Y = (float)readF1000(&data[4]);
+	return p;
 }
 
-inline video::SColor readARGB8(const u8 *data)
+inline v3f readV3F1000(const u8 *data)
 {
-	video::SColor p(readU32(data));
+	v3f p;
+	p.X = (float)readF1000(&data[0]);
+	p.Y = (float)readF1000(&data[4]);
+	p.Z = (float)readF1000(&data[8]);
 	return p;
 }
 
-/*
-	The above stuff directly interfaced to iostream
-*/
+/////////////// write routines ////////////////
 
-inline void writeU8(std::ostream &os, u8 p)
-{
-	char buf[1];
-	writeU8((u8*)buf, p);
-	os.write(buf, 1);
-}
-inline u8 readU8(std::istream &is)
-{
-	char buf[1] = {0};
-	is.read(buf, 1);
-	return readU8((u8*)buf);
-}
-
-inline void writeU16(std::ostream &os, u16 p)
-{
-	char buf[2];
-	writeU16((u8*)buf, p);
-	os.write(buf, 2);
-}
-inline u16 readU16(std::istream &is)
+inline void writeU8(u8 *data, u8 i)
 {
-	char buf[2] = {0};
-	is.read(buf, 2);
-	return readU16((u8*)buf);
+	data[0] = (i >> 0) & 0xFF;
 }
 
-inline void writeU32(std::ostream &os, u32 p)
-{
-	char buf[4];
-	writeU32((u8*)buf, p);
-	os.write(buf, 4);
-}
-inline u32 readU32(std::istream &is)
+inline void writeS8(u8 *data, s8 i)
 {
-	char buf[4] = {0};
-	is.read(buf, 4);
-	return readU32((u8*)buf);
+	writeU8(data, (u8)i);
 }
 
-inline void writeS32(std::ostream &os, s32 p)
-{
-	writeU32(os, (u32) p);
-}
-inline s32 readS32(std::istream &is)
+inline void writeS16(u8 *data, s16 i)
 {
-	return (s32)readU32(is);
+	writeU16(data, (u16)i);
 }
 
-inline void writeS16(std::ostream &os, s16 p)
-{
-	writeU16(os, (u16) p);
-}
-inline s16 readS16(std::istream &is)
+inline void writeS32(u8 *data, s32 i)
 {
-	return (s16)readU16(is);
+	writeU32(data, (u32)i);
 }
 
-inline void writeS8(std::ostream &os, s8 p)
+inline void writeS64(u8 *data, s64 i)
 {
-	writeU8(os, (u8) p);
-}
-inline s8 readS8(std::istream &is)
-{
-	return (s8)readU8(is);
+	writeU64(data, (u64)i);
 }
 
-inline void writeF1000(std::ostream &os, f32 p)
+inline void writeF1000(u8 *data, f32 i)
 {
-	char buf[4];
-	writeF1000((u8*)buf, p);
-	os.write(buf, 4);
-}
-inline f32 readF1000(std::istream &is)
-{
-	char buf[4] = {0};
-	is.read(buf, 4);
-	return readF1000((u8*)buf);
+	writeS32(data, i * FIXEDPOINT_FACTOR);
 }
 
-inline void writeV3F1000(std::ostream &os, v3f p)
-{
-	char buf[12];
-	writeV3F1000((u8*)buf, p);
-	os.write(buf, 12);
-}
-inline v3f readV3F1000(std::istream &is)
+inline void writeARGB8(u8 *data, video::SColor p)
 {
-	char buf[12];
-	is.read(buf, 12);
-	return readV3F1000((u8*)buf);
+	writeU32(data, p.color);
 }
 
-inline void writeV2F1000(std::ostream &os, v2f p)
-{
-	char buf[8];
-	writeV2F1000((u8*)buf, p);
-	os.write(buf, 8);
-}
-inline v2f readV2F1000(std::istream &is)
+inline void writeV2S16(u8 *data, v2s16 p)
 {
-	char buf[8] = {0};
-	is.read(buf, 8);
-	return readV2F1000((u8*)buf);
+	writeS16(&data[0], p.X);
+	writeS16(&data[2], p.Y);
 }
 
-inline void writeV2S16(std::ostream &os, v2s16 p)
-{
-	char buf[4];
-	writeV2S16((u8*)buf, p);
-	os.write(buf, 4);
-}
-inline v2s16 readV2S16(std::istream &is)
+inline void writeV3S16(u8 *data, v3s16 p)
 {
-	char buf[4] = {0};
-	is.read(buf, 4);
-	return readV2S16((u8*)buf);
+	writeS16(&data[0], p.X);
+	writeS16(&data[2], p.Y);
+	writeS16(&data[4], p.Z);
 }
 
-inline void writeV2S32(std::ostream &os, v2s32 p)
-{
-	char buf[8];
-	writeV2S32((u8*)buf, p);
-	os.write(buf, 8);
-}
-inline v2s32 readV2S32(std::istream &is)
+inline void writeV2S32(u8 *data, v2s32 p)
 {
-	char buf[8] = {0};
-	is.read(buf, 8);
-	return readV2S32((u8*)buf);
+	writeS32(&data[0], p.X);
+	writeS32(&data[4], p.Y);
 }
 
-inline void writeV3S16(std::ostream &os, v3s16 p)
-{
-	char buf[6];
-	writeV3S16((u8*)buf, p);
-	os.write(buf, 6);
-}
-inline v3s16 readV3S16(std::istream &is)
+inline void writeV3S32(u8 *data, v3s32 p)
 {
-	char buf[6] = {0};
-	is.read(buf, 6);
-	return readV3S16((u8*)buf);
+	writeS32(&data[0], p.X);
+	writeS32(&data[4], p.Y);
+	writeS32(&data[8], p.Z);
 }
 
-inline void writeARGB8(std::ostream &os, video::SColor p)
+inline void writeV2F1000(u8 *data, v2f p)
 {
-	char buf[4];
-	writeARGB8((u8*)buf, p);
-	os.write(buf, 4);
+	writeF1000(&data[0], p.X);
+	writeF1000(&data[4], p.Y);
 }
 
-inline video::SColor readARGB8(std::istream &is)
+inline void writeV3F1000(u8 *data, v3f p)
 {
-	char buf[4] = {0};
-	is.read(buf, 4);
-	return readARGB8((u8*)buf);
+	writeF1000(&data[0], p.X);
+	writeF1000(&data[4], p.Y);
+	writeF1000(&data[8], p.Z);
 }
 
-/*
-	More serialization stuff
-*/
-
-// 64 MB ought to be enough for anybody - Billy G.
-#define LONG_STRING_MAX (64 * 1024 * 1024)
+////
+//// Iostream wrapper for data read/write
+////
+
+#define MAKE_STREAM_READ_FXN(T, N, S)    \
+	inline T read ## N(std::istream &is) \
+	{                                    \
+		char buf[S] = {0};               \
+		is.read(buf, sizeof(buf));       \
+		return read ## N((u8 *)buf);     \
+	}
+
+#define MAKE_STREAM_WRITE_FXN(T, N, S)              \
+	inline void write ## N(std::ostream &os, T val) \
+	{                                               \
+		char buf[S];                                \
+		write ## N((u8 *)buf, val);                 \
+		os.write(buf, sizeof(buf));                 \
+	}
+
+MAKE_STREAM_READ_FXN(u8,    U8,       1);
+MAKE_STREAM_READ_FXN(u16,   U16,      2);
+MAKE_STREAM_READ_FXN(u32,   U32,      4);
+MAKE_STREAM_READ_FXN(u64,   U64,      8);
+MAKE_STREAM_READ_FXN(s8,    S8,       1);
+MAKE_STREAM_READ_FXN(s16,   S16,      2);
+MAKE_STREAM_READ_FXN(s32,   S32,      4);
+MAKE_STREAM_READ_FXN(s64,   S64,      8);
+MAKE_STREAM_READ_FXN(f32,   F1000,    4);
+MAKE_STREAM_READ_FXN(v2s16, V2S16,    4);
+MAKE_STREAM_READ_FXN(v3s16, V3S16,    6);
+MAKE_STREAM_READ_FXN(v2s32, V2S32,    8);
+MAKE_STREAM_READ_FXN(v3s32, V3S32,   12);
+MAKE_STREAM_READ_FXN(v2f,   V2F1000,  8);
+MAKE_STREAM_READ_FXN(v3f,   V3F1000, 12);
+MAKE_STREAM_READ_FXN(video::SColor, ARGB8, 4);
+
+MAKE_STREAM_WRITE_FXN(u8,    U8,       1);
+MAKE_STREAM_WRITE_FXN(u16,   U16,      2);
+MAKE_STREAM_WRITE_FXN(u32,   U32,      4);
+MAKE_STREAM_WRITE_FXN(u64,   U64,      8);
+MAKE_STREAM_WRITE_FXN(s8,    S8,       1);
+MAKE_STREAM_WRITE_FXN(s16,   S16,      2);
+MAKE_STREAM_WRITE_FXN(s32,   S32,      4);
+MAKE_STREAM_WRITE_FXN(s64,   S64,      8);
+MAKE_STREAM_WRITE_FXN(f32,   F1000,    4);
+MAKE_STREAM_WRITE_FXN(v2s16, V2S16,    4);
+MAKE_STREAM_WRITE_FXN(v3s16, V3S16,    6);
+MAKE_STREAM_WRITE_FXN(v2s32, V2S32,    8);
+MAKE_STREAM_WRITE_FXN(v3s32, V3S32,   12);
+MAKE_STREAM_WRITE_FXN(v2f,   V2F1000,  8);
+MAKE_STREAM_WRITE_FXN(v3f,   V3F1000, 12);
+MAKE_STREAM_WRITE_FXN(video::SColor, ARGB8, 4);
+
+////
+//// More serialization stuff
+////
 
 // Creates a string with the length as the first two bytes
 std::string serializeString(const std::string &plain);
@@ -467,4 +395,3 @@ bool deSerializeStringToStruct(std::string valstr,
 	std::string format, void *out, size_t olen);
 
 #endif
-