aboutsummaryrefslogtreecommitdiff
path: root/src/util.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-09 17:26:16 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-09 17:26:42 +0200
commit605d5b55582f00ea8a089fe632cd8a52e951126b (patch)
treec92db0c674fb1adf9f3a8f0c743547af1db59523 /src/util.cpp
parent8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa (diff)
parent21bf3d257b88c45e2bb0b47e36e73d7462760c2c (diff)
Merge pull request #4102
21bf3d2 Add tests for BoostAsioToCNetAddr (Wladimir J. van der Laan) fdbd707 Remove unused function WildcardMatch (Wladimir J. van der Laan) ee21912 rpc: Use netmasks instead of wildcards for IP address matching (Wladimir J. van der Laan) e16be73 net: Add CSubNet class for subnet matching (Wladimir J. van der Laan) d864275 Use new function parseint32 in SplitHostPort (Wladimir J. van der Laan) 0d4ea1c util: add parseint32 function with strict error reporting (Wladimir J. van der Laan)
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp51
1 files changed, 14 insertions, 37 deletions
diff --git a/src/util.cpp b/src/util.cpp
index a919b4b854..00e29446d5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -889,43 +889,6 @@ string DecodeBase32(const string& str)
return string((const char*)&vchRet[0], vchRet.size());
}
-
-bool WildcardMatch(const char* psz, const char* mask)
-{
- while (true)
- {
- switch (*mask)
- {
- case '\0':
- return (*psz == '\0');
- case '*':
- return WildcardMatch(psz, mask+1) || (*psz && WildcardMatch(psz+1, mask));
- case '?':
- if (*psz == '\0')
- return false;
- break;
- default:
- if (*psz != *mask)
- return false;
- break;
- }
- psz++;
- mask++;
- }
-}
-
-bool WildcardMatch(const string& str, const string& mask)
-{
- return WildcardMatch(str.c_str(), mask.c_str());
-}
-
-
-
-
-
-
-
-
static std::string FormatException(std::exception* pex, const char* pszThread)
{
#ifdef WIN32
@@ -1427,3 +1390,17 @@ void RenameThread(const char* name)
#endif
}
+bool ParseInt32(const std::string& str, int32_t *out)
+{
+ char *endp = NULL;
+ errno = 0; // strtol will not set errno if valid
+ long int n = strtol(str.c_str(), &endp, 10);
+ if(out) *out = (int)n;
+ // Note that strtol returns a *long int*, so even if strtol doesn't report a over/underflow
+ // we still have to check that the returned value is within the range of an *int32_t*. On 64-bit
+ // platforms the size of these types may be different.
+ return endp && *endp == 0 && !errno &&
+ n >= std::numeric_limits<int32_t>::min() &&
+ n <= std::numeric_limits<int32_t>::max();
+}
+