diff options
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/StringUtil.cc | 22 | ||||
-rw-r--r-- | src/FbTk/StringUtil.hh | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc index 182233b..0a7ebd3 100644 --- a/src/FbTk/StringUtil.cc +++ b/src/FbTk/StringUtil.cc | |||
@@ -123,9 +123,27 @@ int extractNumber(const std::string& in, unsigned int& out) { | |||
123 | return ::extractUnsignedNumber<unsigned int>(in, out); | 123 | return ::extractUnsignedNumber<unsigned int>(in, out); |
124 | } | 124 | } |
125 | 125 | ||
126 | std::string number2String(int num) { | 126 | int extractNumber(const std::string& in, long& out) { |
127 | return ::extractSignedNumber<long>(in, out); | ||
128 | } | ||
129 | |||
130 | int extractNumber(const std::string& in, unsigned long& out) { | ||
131 | return ::extractUnsignedNumber<unsigned long>(in, out); | ||
132 | } | ||
133 | |||
134 | int extractNumber(const std::string& in, long long& out) { | ||
135 | return ::extractSignedNumber<long long>(in, out); | ||
136 | } | ||
137 | |||
138 | int extractNumber(const std::string& in, unsigned long long& out) { | ||
139 | return ::extractUnsignedNumber<unsigned long long>(in, out); | ||
140 | } | ||
141 | |||
142 | |||
143 | |||
144 | std::string number2String(long long num) { | ||
127 | char s[128]; | 145 | char s[128]; |
128 | sprintf(s, "%d", num); | 146 | sprintf(s, "%lld", num); |
129 | return std::string(s); | 147 | return std::string(s); |
130 | } | 148 | } |
131 | 149 | ||
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh index a16e709..9e45460 100644 --- a/src/FbTk/StringUtil.hh +++ b/src/FbTk/StringUtil.hh | |||
@@ -36,10 +36,14 @@ namespace StringUtil { | |||
36 | /// @return 1 - ok, result stored in 'out' | 36 | /// @return 1 - ok, result stored in 'out' |
37 | int extractNumber(const std::string& in, unsigned int& out); | 37 | int extractNumber(const std::string& in, unsigned int& out); |
38 | int extractNumber(const std::string& in, int& out); | 38 | int extractNumber(const std::string& in, int& out); |
39 | int extractNumber(const std::string& in, unsigned long& out); | ||
40 | int extractNumber(const std::string& in, long& out); | ||
41 | int extractNumber(const std::string& in, long long& out); | ||
42 | int extractNumber(const std::string& in, unsigned long& out); | ||
39 | /// \@} | 43 | /// \@} |
40 | 44 | ||
41 | /// creates a number to a string | 45 | /// creates a number to a string |
42 | std::string number2String(int num); | 46 | std::string number2String(long long num); |
43 | 47 | ||
44 | /// Similar to `strstr' but this function ignores the case of both strings | 48 | /// Similar to `strstr' but this function ignores the case of both strings |
45 | const char *strcasestr(const char *str, const char *ptn); | 49 | const char *strcasestr(const char *str, const char *ptn); |