Clean up serialization

This reverts 1a5b4b3 and further functions in serialize.cpp that are unused

The intend for a sane NetworkPacket/stream replacement was good, but a wrapper
class around i/ostream might be more versatile than introducing a new
vector-based serialization class.

2 files changed, 0 insertions, 591 deletions

diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
index 5b276668d..fd5cbda21 100644
--- a/src/util/serialize.cpp
+++ b/src/util/serialize.cpp
@@ -30,74 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 FloatType g_serialize_f32_type = FLOATTYPE_UNKNOWN;
 
-////
-//// BufReader
-////
-
-bool BufReader::getStringNoEx(std::string *val)
-{
-	u16 num_chars;
-	if (!getU16NoEx(&num_chars))
-		return false;
-
-	if (pos + num_chars > size) {
-		pos -= sizeof(num_chars);
-		return false;
-	}
-
-	val->assign((const char *)data + pos, num_chars);
-	pos += num_chars;
-
-	return true;
-}
-
-bool BufReader::getWideStringNoEx(std::wstring *val)
-{
-	u16 num_chars;
-	if (!getU16NoEx(&num_chars))
-		return false;
-
-	if (pos + num_chars * 2 > size) {
-		pos -= sizeof(num_chars);
-		return false;
-	}
-
-	for (size_t i = 0; i != num_chars; i++) {
-		val->push_back(readU16(data + pos));
-		pos += 2;
-	}
-
-	return true;
-}
-
-bool BufReader::getLongStringNoEx(std::string *val)
-{
-	u32 num_chars;
-	if (!getU32NoEx(&num_chars))
-		return false;
-
-	if (pos + num_chars > size) {
-		pos -= sizeof(num_chars);
-		return false;
-	}
-
-	val->assign((const char *)data + pos, num_chars);
-	pos += num_chars;
-
-	return true;
-}
-
-bool BufReader::getRawDataNoEx(void *val, size_t len)
-{
-	if (pos + len > size)
-		return false;
-
-	memcpy(val, data + pos, len);
-	pos += len;
-
-	return true;
-}
-
 
 ////
 //// String
@@ -404,284 +336,3 @@ std::string deSerializeJsonStringIfNeeded(std::istream &is)
 	return tmp_os.str();
 }
 
-////
-//// String/Struct conversions
-////
-
-bool deSerializeStringToStruct(std::string valstr,
-	std::string format, void *out, size_t olen)
-{
-	size_t len = olen;
-	std::vector<std::string *> strs_alloced;
-	std::string *str;
-	char *f, *snext;
-	size_t pos;
-
-	char *s = &valstr[0];
-	char *buf = new char[len];
-	char *bufpos = buf;
-
-	char *fmtpos, *fmt = &format[0];
-	while ((f = strtok_r(fmt, ",", &fmtpos)) && s) {
-		fmt = nullptr;
-
-		bool is_unsigned = false;
-		int width = 0;
-		char valtype = *f;
-
-		width = (int)strtol(f + 1, &f, 10);
-		if (width && valtype == 's')
-			valtype = 'i';
-
-		switch (valtype) {
-			case 'u':
-				is_unsigned = true;
-				/* FALLTHROUGH */
-			case 'i':
-				if (width == 16) {
-					bufpos += PADDING(bufpos, u16);
-					if ((bufpos - buf) + sizeof(u16) <= len) {
-						if (is_unsigned)
-							*(u16 *)bufpos = (u16)strtoul(s, &s, 10);
-						else
-							*(s16 *)bufpos = (s16)strtol(s, &s, 10);
-					}
-					bufpos += sizeof(u16);
-				} else if (width == 32) {
-					bufpos += PADDING(bufpos, u32);
-					if ((bufpos - buf) + sizeof(u32) <= len) {
-						if (is_unsigned)
-							*(u32 *)bufpos = (u32)strtoul(s, &s, 10);
-						else
-							*(s32 *)bufpos = (s32)strtol(s, &s, 10);
-					}
-					bufpos += sizeof(u32);
-				} else if (width == 64) {
-					bufpos += PADDING(bufpos, u64);
-					if ((bufpos - buf) + sizeof(u64) <= len) {
-						if (is_unsigned)
-							*(u64 *)bufpos = (u64)strtoull(s, &s, 10);
-						else
-							*(s64 *)bufpos = (s64)strtoll(s, &s, 10);
-					}
-					bufpos += sizeof(u64);
-				}
-				s = strchr(s, ',');
-				break;
-			case 'b':
-				snext = strchr(s, ',');
-				if (snext)
-					*snext++ = 0;
-
-				bufpos += PADDING(bufpos, bool);
-				if ((bufpos - buf) + sizeof(bool) <= len)
-					*(bool *)bufpos = is_yes(std::string(s));
-				bufpos += sizeof(bool);
-
-				s = snext;
-				break;
-			case 'f':
-				bufpos += PADDING(bufpos, float);
-				if ((bufpos - buf) + sizeof(float) <= len)
-					*(float *)bufpos = strtof(s, &s);
-				bufpos += sizeof(float);
-
-				s = strchr(s, ',');
-				break;
-			case 's':
-				while (*s == ' ' || *s == '\t')
-					s++;
-				if (*s++ != '"') //error, expected string
-					goto fail;
-				snext = s;
-
-				while (snext[0] && !(snext[-1] != '\\' && snext[0] == '"'))
-					snext++;
-				*snext++ = 0;
-
-				bufpos += PADDING(bufpos, std::string *);
-
-				str = new std::string(s);
-				pos = 0;
-				while ((pos = str->find("\\\"", pos)) != std::string::npos)
-					str->erase(pos, 1);
-
-				if ((bufpos - buf) + sizeof(std::string *) <= len)
-					*(std::string **)bufpos = str;
-				bufpos += sizeof(std::string *);
-				strs_alloced.push_back(str);
-
-				s = *snext ? snext + 1 : nullptr;
-				break;
-			case 'v':
-				while (*s == ' ' || *s == '\t')
-					s++;
-				if (*s++ != '(') //error, expected vector
-					goto fail;
-
-				if (width == 2) {
-					bufpos += PADDING(bufpos, v2f);
-
-					if ((bufpos - buf) + sizeof(v2f) <= len) {
-					v2f *v = (v2f *)bufpos;
-						v->X = strtof(s, &s);
-						s++;
-						v->Y = strtof(s, &s);
-					}
-
-					bufpos += sizeof(v2f);
-				} else if (width == 3) {
-					bufpos += PADDING(bufpos, v3f);
-					if ((bufpos - buf) + sizeof(v3f) <= len) {
-						v3f *v = (v3f *)bufpos;
-						v->X = strtof(s, &s);
-						s++;
-						v->Y = strtof(s, &s);
-						s++;
-						v->Z = strtof(s, &s);
-					}
-
-					bufpos += sizeof(v3f);
-				}
-				s = strchr(s, ',');
-				break;
-			default: //error, invalid format specifier
-				goto fail;
-		}
-
-		if (s && *s == ',')
-			s++;
-
-		if ((size_t)(bufpos - buf) > len) //error, buffer too small
-			goto fail;
-	}
-
-	if (f && *f) { //error, mismatched number of fields and values
-fail:
-		for (size_t i = 0; i != strs_alloced.size(); i++)
-			delete strs_alloced[i];
-		delete[] buf;
-		return false;
-	}
-
-	memcpy(out, buf, olen);
-	delete[] buf;
-	return true;
-}
-
-// Casts *buf to a signed or unsigned fixed-width integer of 'w' width
-#define SIGN_CAST(w, buf) (is_unsigned ? *((u##w *) buf) : *((s##w *) buf))
-
-bool serializeStructToString(std::string *out,
-	std::string format, void *value)
-{
-	std::ostringstream os;
-	std::string str;
-	char *f;
-	size_t strpos;
-
-	char *bufpos = (char *) value;
-	char *fmtpos, *fmt = &format[0];
-	while ((f = strtok_r(fmt, ",", &fmtpos))) {
-		fmt = nullptr;
-		bool is_unsigned = false;
-		int width = 0;
-		char valtype = *f;
-
-		width = (int)strtol(f + 1, &f, 10);
-		if (width && valtype == 's')
-			valtype = 'i';
-
-		switch (valtype) {
-			case 'u':
-				is_unsigned = true;
-				/* FALLTHROUGH */
-			case 'i':
-				if (width == 16) {
-					bufpos += PADDING(bufpos, u16);
-					os << SIGN_CAST(16, bufpos);
-					bufpos += sizeof(u16);
-				} else if (width == 32) {
-					bufpos += PADDING(bufpos, u32);
-					os << SIGN_CAST(32, bufpos);
-					bufpos += sizeof(u32);
-				} else if (width == 64) {
-					bufpos += PADDING(bufpos, u64);
-					os << SIGN_CAST(64, bufpos);
-					bufpos += sizeof(u64);
-				}
-				break;
-			case 'b':
-				bufpos += PADDING(bufpos, bool);
-				os << std::boolalpha << *((bool *) bufpos);
-				bufpos += sizeof(bool);
-				break;
-			case 'f':
-				bufpos += PADDING(bufpos, float);
-				os << *((float *) bufpos);
-				bufpos += sizeof(float);
-				break;
-			case 's':
-				bufpos += PADDING(bufpos, std::string *);
-				str = **((std::string **) bufpos);
-
-				strpos = 0;
-				while ((strpos = str.find('"', strpos)) != std::string::npos) {
-					str.insert(strpos, 1, '\\');
-					strpos += 2;
-				}
-
-				os << str;
-				bufpos += sizeof(std::string *);
-				break;
-			case 'v':
-				if (width == 2) {
-					bufpos += PADDING(bufpos, v2f);
-					v2f *v = (v2f *) bufpos;
-					os << '(' << v->X << ", " << v->Y << ')';
-					bufpos += sizeof(v2f);
-				} else {
-					bufpos += PADDING(bufpos, v3f);
-					v3f *v = (v3f *) bufpos;
-					os << '(' << v->X << ", " << v->Y << ", " << v->Z << ')';
-					bufpos += sizeof(v3f);
-				}
-				break;
-			default:
-				return false;
-		}
-		os << ", ";
-	}
-	*out = os.str();
-
-	// Trim off the trailing comma and space
-	if (out->size() >= 2)
-		out->resize(out->size() - 2);
-
-	return true;
-}
-
-#undef SIGN_CAST
-
-////
-//// Other
-////
-
-std::string serializeHexString(const std::string &data, bool insert_spaces)
-{
-	std::string result;
-	result.reserve(data.size() * (2 + insert_spaces));
-
-	static const char hex_chars[] = "0123456789abcdef";
-
-	const size_t len = data.size();
-	for (size_t i = 0; i != len; i++) {
-		u8 byte = data[i];
-		result.push_back(hex_chars[(byte >> 4) & 0x0F]);
-		result.push_back(hex_chars[(byte >> 0) & 0x0F]);
-		if (insert_spaces && i != len - 1)
-			result.push_back(' ');
-	}
-
-	return result;
-}
diff --git a/src/util/serialize.h b/src/util/serialize.h
index a4b5a234a..a988a8f78 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -442,15 +442,9 @@ MAKE_STREAM_WRITE_FXN(video::SColor, ARGB8, 4);
 // Creates a string with the length as the first two bytes
 std::string serializeString(const std::string &plain);
 
-// Creates a string with the length as the first two bytes from wide string
-std::string serializeWideString(const std::wstring &plain);
-
 // Reads a string with the length as the first two bytes
 std::string deSerializeString(std::istream &is);
 
-// Reads a wide string with the length as the first two bytes
-std::wstring deSerializeWideString(std::istream &is);
-
 // Creates a string with the length as the first four bytes
 std::string serializeLongString(const std::string &plain);
 
@@ -469,239 +463,3 @@ std::string serializeJsonStringIfNeeded(const std::string &s);
 
 // Parses a string serialized by serializeJsonStringIfNeeded.
 std::string deSerializeJsonStringIfNeeded(std::istream &is);
-
-// Creates a string consisting of the hexadecimal representation of `data`
-std::string serializeHexString(const std::string &data, bool insert_spaces=false);
-
-// Creates a string containing comma delimited values of a struct whose layout is
-// described by the parameter format
-bool serializeStructToString(std::string *out,
-	std::string format, void *value);
-
-// Reads a comma delimited string of values into a struct whose layout is
-// decribed by the parameter format
-bool deSerializeStringToStruct(std::string valstr,
-	std::string format, void *out, size_t olen);
-
-////
-//// BufReader
-////
-
-#define MAKE_BUFREADER_GETNOEX_FXN(T, N, S) \
-	inline bool get ## N ## NoEx(T *val)    \
-	{                                       \
-		if (pos + S > size)                 \
-			return false;                   \
-		*val = read ## N(data + pos);       \
-		pos += S;                           \
-		return true;                        \
-	}
-
-#define MAKE_BUFREADER_GET_FXN(T, N) \
-	inline T get ## N()              \
-	{                                \
-		T val;                       \
-		if (!get ## N ## NoEx(&val)) \
-			throw SerializationError("Attempted read past end of data"); \
-		return val;                  \
-	}
-
-class BufReader {
-public:
-	BufReader(const u8 *data_, size_t size_) :
-		data(data_),
-		size(size_)
-	{
-	}
-
-	MAKE_BUFREADER_GETNOEX_FXN(u8,    U8,       1);
-	MAKE_BUFREADER_GETNOEX_FXN(u16,   U16,      2);
-	MAKE_BUFREADER_GETNOEX_FXN(u32,   U32,      4);
-	MAKE_BUFREADER_GETNOEX_FXN(u64,   U64,      8);
-	MAKE_BUFREADER_GETNOEX_FXN(s8,    S8,       1);
-	MAKE_BUFREADER_GETNOEX_FXN(s16,   S16,      2);
-	MAKE_BUFREADER_GETNOEX_FXN(s32,   S32,      4);
-	MAKE_BUFREADER_GETNOEX_FXN(s64,   S64,      8);
-	MAKE_BUFREADER_GETNOEX_FXN(f32,   F1000,    4);
-	MAKE_BUFREADER_GETNOEX_FXN(v2s16, V2S16,    4);
-	MAKE_BUFREADER_GETNOEX_FXN(v3s16, V3S16,    6);
-	MAKE_BUFREADER_GETNOEX_FXN(v2s32, V2S32,    8);
-	MAKE_BUFREADER_GETNOEX_FXN(v3s32, V3S32,   12);
-	MAKE_BUFREADER_GETNOEX_FXN(v3f,   V3F1000, 12);
-	MAKE_BUFREADER_GETNOEX_FXN(video::SColor, ARGB8, 4);
-
-	bool getStringNoEx(std::string *val);
-	bool getWideStringNoEx(std::wstring *val);
-	bool getLongStringNoEx(std::string *val);
-	bool getRawDataNoEx(void *data, size_t len);
-
-	MAKE_BUFREADER_GET_FXN(u8,            U8);
-	MAKE_BUFREADER_GET_FXN(u16,           U16);
-	MAKE_BUFREADER_GET_FXN(u32,           U32);
-	MAKE_BUFREADER_GET_FXN(u64,           U64);
-	MAKE_BUFREADER_GET_FXN(s8,            S8);
-	MAKE_BUFREADER_GET_FXN(s16,           S16);
-	MAKE_BUFREADER_GET_FXN(s32,           S32);
-	MAKE_BUFREADER_GET_FXN(s64,           S64);
-	MAKE_BUFREADER_GET_FXN(f32,           F1000);
-	MAKE_BUFREADER_GET_FXN(v2s16,         V2S16);
-	MAKE_BUFREADER_GET_FXN(v3s16,         V3S16);
-	MAKE_BUFREADER_GET_FXN(v2s32,         V2S32);
-	MAKE_BUFREADER_GET_FXN(v3s32,         V3S32);
-	MAKE_BUFREADER_GET_FXN(v3f,           V3F1000);
-	MAKE_BUFREADER_GET_FXN(video::SColor, ARGB8);
-	MAKE_BUFREADER_GET_FXN(std::string,   String);
-	MAKE_BUFREADER_GET_FXN(std::wstring,  WideString);
-	MAKE_BUFREADER_GET_FXN(std::string,   LongString);
-
-	inline void getRawData(void *val, size_t len)
-	{
-		if (!getRawDataNoEx(val, len))
-			throw SerializationError("Attempted read past end of data");
-	}
-
-	inline size_t remaining()
-	{
-		assert(pos <= size);
-		return size - pos;
-	}
-
-	const u8 *data;
-	size_t size;
-	size_t pos = 0;
-};
-
-#undef MAKE_BUFREADER_GET_FXN
-#undef MAKE_BUFREADER_GETNOEX_FXN
-
-
-////
-//// Vector-based write routines
-////
-
-inline void putU8(std::vector<u8> *dest, u8 val)
-{
-	dest->push_back((val >> 0) & 0xFF);
-}
-
-inline void putU16(std::vector<u8> *dest, u16 val)
-{
-	dest->push_back((val >> 8) & 0xFF);
-	dest->push_back((val >> 0) & 0xFF);
-}
-
-inline void putU32(std::vector<u8> *dest, u32 val)
-{
-	dest->push_back((val >> 24) & 0xFF);
-	dest->push_back((val >> 16) & 0xFF);
-	dest->push_back((val >>  8) & 0xFF);
-	dest->push_back((val >>  0) & 0xFF);
-}
-
-inline void putU64(std::vector<u8> *dest, u64 val)
-{
-	dest->push_back((val >> 56) & 0xFF);
-	dest->push_back((val >> 48) & 0xFF);
-	dest->push_back((val >> 40) & 0xFF);
-	dest->push_back((val >> 32) & 0xFF);
-	dest->push_back((val >> 24) & 0xFF);
-	dest->push_back((val >> 16) & 0xFF);
-	dest->push_back((val >>  8) & 0xFF);
-	dest->push_back((val >>  0) & 0xFF);
-}
-
-inline void putS8(std::vector<u8> *dest, s8 val)
-{
-	putU8(dest, val);
-}
-
-inline void putS16(std::vector<u8> *dest, s16 val)
-{
-	putU16(dest, val);
-}
-
-inline void putS32(std::vector<u8> *dest, s32 val)
-{
-	putU32(dest, val);
-}
-
-inline void putS64(std::vector<u8> *dest, s64 val)
-{
-	putU64(dest, val);
-}
-
-inline void putF1000(std::vector<u8> *dest, f32 val)
-{
-	putS32(dest, val * FIXEDPOINT_FACTOR);
-}
-
-inline void putV2S16(std::vector<u8> *dest, v2s16 val)
-{
-	putS16(dest, val.X);
-	putS16(dest, val.Y);
-}
-
-inline void putV3S16(std::vector<u8> *dest, v3s16 val)
-{
-	putS16(dest, val.X);
-	putS16(dest, val.Y);
-	putS16(dest, val.Z);
-}
-
-inline void putV2S32(std::vector<u8> *dest, v2s32 val)
-{
-	putS32(dest, val.X);
-	putS32(dest, val.Y);
-}
-
-inline void putV3S32(std::vector<u8> *dest, v3s32 val)
-{
-	putS32(dest, val.X);
-	putS32(dest, val.Y);
-	putS32(dest, val.Z);
-}
-
-inline void putV3F1000(std::vector<u8> *dest, v3f val)
-{
-	putF1000(dest, val.X);
-	putF1000(dest, val.Y);
-	putF1000(dest, val.Z);
-}
-
-inline void putARGB8(std::vector<u8> *dest, video::SColor val)
-{
-	putU32(dest, val.color);
-}
-
-inline void putString(std::vector<u8> *dest, const std::string &val)
-{
-	if (val.size() > STRING_MAX_LEN)
-		throw SerializationError("String too long");
-
-	putU16(dest, val.size());
-	dest->insert(dest->end(), val.begin(), val.end());
-}
-
-inline void putWideString(std::vector<u8> *dest, const std::wstring &val)
-{
-	if (val.size() > WIDE_STRING_MAX_LEN)
-		throw SerializationError("String too long");
-
-	putU16(dest, val.size());
-	for (size_t i = 0; i != val.size(); i++)
-		putU16(dest, val[i]);
-}
-
-inline void putLongString(std::vector<u8> *dest, const std::string &val)
-{
-	if (val.size() > LONG_STRING_MAX_LEN)
-		throw SerializationError("String too long");
-
-	putU32(dest, val.size());
-	dest->insert(dest->end(), val.begin(), val.end());
-}
-
-inline void putRawData(std::vector<u8> *dest, const void *src, size_t len)
-{
-	dest->insert(dest->end(), (u8 *)src, (u8 *)src + len);
-}