oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Random misc. warning fixes and cleanups

Browse source 
- Fix unused c_sand member warning in Valleys Mapgen
 - Fix some code style
 - Make some std::string params const ref
This commit is contained in:
kwolekr 2016-06-11 03:23:53 -04:00
parent 33b874fea3
commit 27aff22a9b
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/util/string.cpp
View file

@ -314,7 +314,7 @@ std::string wide_to_narrow(const std::wstring &wcs)
#endif
std::string urlencode(std::string str)
std::string urlencode(const std::string &str)
{
// Encodes non-unreserved URI characters by a percent sign
// followed by two hex digits. See RFC 3986, section 2.3.
@ -322,17 +322,18 @@ std::string urlencode(std::string str)
std::ostringstream oss(std::ios::binary);
for (u32 i = 0; i < str.size(); i++) {
unsigned char c = str[i];
if (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~')
if (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~') {
oss << c;
else
} else {
oss << "%"
<< url_hex_chars[(c & 0xf0) >> 4]
<< url_hex_chars[c & 0x0f];
}
}
return oss.str();
}
std::string urldecode(std::string str)
std::string urldecode(const std::string &str)
{
// Inverse of urlencode
std::ostringstream oss(std::ios::binary);
@ -343,18 +344,20 @@ std::string urldecode(std::string str)
hex_digit_decode(str[i+2], lowvalue)) {
oss << (char) ((highvalue << 4) | lowvalue);
i += 2;
}
else
} else {
oss << str[i];
}
}
return oss.str();
}
u32 readFlagString(std::string str, const FlagDesc *flagdesc, u32 *flagmask)
{
u32 result = 0, mask = 0;
u32 result = 0;
u32 mask = 0;
char *s = &str[0];
char *flagstr, *strpos = NULL;
char *flagstr;
char *strpos = NULL;
while ((flagstr = strtok_r(s, ",", &strpos))) {
s = NULL;