use FbTk::API to reduce code duplication

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) {
     return ::extractUnsignedNumber<unsigned int>(in, out);
 }
 
-std::string number2String(int num) {
+int extractNumber(const std::string& in, long& out) {
+    return ::extractSignedNumber<long>(in, out);
+}
+
+int extractNumber(const std::string& in, unsigned long& out) {
+    return ::extractUnsignedNumber<unsigned long>(in, out);
+}
+
+int extractNumber(const std::string& in, long long& out) {
+    return ::extractSignedNumber<long long>(in, out);
+}
+
+int extractNumber(const std::string& in, unsigned long long& out) {
+    return ::extractUnsignedNumber<unsigned long long>(in, out);
+}
+
+
+
+std::string number2String(long long num) {
     char s[128];
-    sprintf(s, "%d", num);
+    sprintf(s, "%lld", num);
     return std::string(s);
 }
 
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 {
 /// @return 1 - ok, result stored in 'out'
 int extractNumber(const std::string& in, unsigned int& out);
 int extractNumber(const std::string& in, int& out);
+int extractNumber(const std::string& in, unsigned long& out);
+int extractNumber(const std::string& in, long& out);
+int extractNumber(const std::string& in, long long& out);
+int extractNumber(const std::string& in, unsigned long& out);
 /// \@}
 
 /// creates a number to a string
-std::string number2String(int num);
+std::string number2String(long long num);
 
 /// Similar to `strstr' but this function ignores the case of both strings
 const char *strcasestr(const char *str, const char *ptn);