luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-15 03:28:28 +01:00
Code Activity

For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives

Browse Source
This commit is contained in:
Craig Robbins
2015-03-06 20:21:51 +10:00
parent a603a76787
commit ced6d20295
62 changed files with 299 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/serialize.cpp
View File

@@ -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];

9
src/util/string.cpp
View File

@@ -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);
}