Fix warnings reported by clang

[oweals/minetest.git] / src / util / string.h

diff --git a/src/util/string.h b/src/util/string.h
index a3f84c0eab27ff40ad45880bc23e1f398687e560..6e2db0af46cbe58e1e037375239b59b509d92dec 100644 (file)
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -26,7 +26,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cstring>
 #include <vector>
 #include <sstream>
-#include "exceptions.h"
+#include <cctype>
+
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
 
 struct FlagDesc {
        const char *name;
@@ -146,31 +149,17 @@ inline std::string trim(const std::string &s)
        return s.substr(front, back - front);
 }
 
-inline s32 mystoi(const std::string &s)
-{
-       char* endptr = NULL;
-       s32 retval = strtol(s.c_str(),&endptr,10);
-
-       if ((endptr == NULL) || (*endptr != 0) || (endptr == s.c_str()))
-               throw NumericException("string to convert");
-
-       return retval;
-}
-
 inline bool is_yes(const std::string &s)
 {
        std::string s2 = lowercase(trim(s));
-       try {
-               if(s2 == "y" || s2 == "yes" || s2 == "true" || mystoi(s2) != 0)
-                       return true;
-       }
-       catch(NumericException&e) {}
+       if(s2 == "y" || s2 == "yes" || s2 == "true" || atoi(s2.c_str()) != 0)
+               return true;
        return false;
 }
 
 inline s32 mystoi(const std::string &s, s32 min, s32 max)
 {
-       s32 i = mystoi(s);
+       s32 i = atoi(s.c_str());
        if(i < min)
                i = min;
        if(i > max)
@@ -180,7 +169,7 @@ inline s32 mystoi(const std::string &s, s32 min, s32 max)
 
 inline s64 stoi64(const std::string &s) {
        std::stringstream tmp(s);
-       long long t;
+       s64 t;
        tmp >> t;
        return t;
 }
@@ -188,20 +177,25 @@ inline s64 stoi64(const std::string &s) {
 // MSVC2010 includes it's own versions of these
 //#if !defined(_MSC_VER) || _MSC_VER < 1600
 
+inline s32 mystoi(const std::string &s)
+{
+       return atoi(s.c_str());
+}
+
 inline s32 mystoi(const std::wstring &s)
 {
-       return mystoi(wide_to_narrow(s).c_str());
+       return atoi(wide_to_narrow(s).c_str());
 }
 
 inline float mystof(const std::string &s)
 {
-       char* endptr = NULL;
-       float retval = strtof(s.c_str(),&endptr);
-
-       if ((endptr == NULL) || (*endptr != 0) || (endptr == s.c_str()))
-               throw NumericException("string to convert");
-
-       return retval;
+       // This crap causes a segfault in certain cases on MinGW
+       /*float f;
+       std::istringstream ss(s);
+       ss>>f;
+       return f;*/
+       // This works in that case
+       return atof(s.c_str());
 }
 
 //#endif
@@ -326,11 +320,23 @@ inline std::string unescape_string(std::string &s)
        return res;
 }
 
+inline bool is_number(const std::string& tocheck)
+{
+       std::string::const_iterator iter = tocheck.begin();
+
+       while (iter != tocheck.end() && std::isdigit(*iter)) {
+               ++iter;
+       }
+
+       return ((!tocheck.empty()) && (iter == tocheck.end()));
+}
+
 std::string translatePassword(std::string playername, std::wstring password);
 std::string urlencode(std::string str);
 std::string urldecode(std::string str);
-u32 readFlagString(std::string str, FlagDesc *flagdesc);
-std::string writeFlagString(u32 flags, FlagDesc *flagdesc);
+u32 readFlagString(std::string str, FlagDesc *flagdesc, u32 *flagmask);
+std::string writeFlagString(u32 flags, FlagDesc *flagdesc, u32 flagmask);
+size_t mystrlcpy(char *dst, const char *src, size_t size);
 char *mystrtok_r(char *s, const char *sep, char **lasts);
 u64 read_seed(const char *str);