diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/serialize.cpp | 2 | ||||
| -rw-r--r-- | src/util/string.cpp | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp index 8a108a0ff..659e816b0 100644 --- a/src/util/serialize.cpp +++ b/src/util/serialize.cpp @@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc., // Creates a string with the length as the first two bytes std::string serializeString(const std::string &plain) { - //assert(plain.size() <= 65535); if(plain.size() > 65535) throw SerializationError("String too long for serializeString"); char buf[2]; @@ -45,7 +44,6 @@ 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) { - //assert(plain.size() <= 65535); if(plain.size() > 65535) throw SerializationError("String too long for serializeString"); char buf[2]; diff --git a/src/util/string.cpp b/src/util/string.cpp index 651293bfe..02a0586e7 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -320,7 +320,7 @@ char *mystrtok_r(char *s, const char *sep, char **lasts) } t++; } - + *lasts = t; return s; } @@ -329,15 +329,15 @@ u64 read_seed(const char *str) { char *endptr; u64 num; - + if (str[0] == '0' && str[1] == 'x') num = strtoull(str, &endptr, 16); else num = strtoull(str, &endptr, 10); - + if (*endptr) num = murmur_hash_64_ua(str, (int)strlen(str), 0x1337); - + return num; } @@ -614,4 +614,3 @@ void str_replace(std::string &str, char from, char to) { std::replace(str.begin(), str.end(), from, to); } - |