Changeset fa11893 in nscp

Timestamp:

05/04/12 06:25:43 (13 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

67c6d04, 53473f7

Parents:

d9cdcb3

Message:

• Fixed issue with parsing size-type (usch as MinCritFree?=10G)

Files:

• changelog (modified) (1 diff)
• include/strEx.h (modified) (1 diff)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -4 +4 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-05-03 MickeM
+ * Fixed issue with parsing size-type (usch as MinCritFree=10G)
+
+2012-05-01 MickeM
+ * Release 0.4.0
 
 2012-04-26 MickeM

include/strEx.h

@@ -689 +689 @@
   }
 
-  inline long long stoi64_as_BKMG(std::wstring s) {
-    std::wstring::size_type p = s.find_first_of(_T("BMKGT"));
-    if (p == std::wstring::npos)
-      return boost::lexical_cast<long long>(s.c_str());
-    else if (s[p] == 'B') 
-      return boost::lexical_cast<long long>(s.c_str());
+  inline long long stoi64_as_BKMG(const std::wstring &s) {
+    std::wstring::size_type p = s.find_first_not_of(_T("0123456789"));
+    if (p == std::wstring::npos || p == 0)
+      return boost::lexical_cast<long long>(s);
+    std::wstring numbers = s.substr(0, p);
+    if (s[p] == 'B') 
+      return boost::lexical_cast<long long>(numbers);
     else if (s[p] == 'K') 
-      return boost::lexical_cast<long long>(s.c_str())*1024;
+      return boost::lexical_cast<long long>(numbers)*1024;
     else if (s[p] == 'M') 
-      return boost::lexical_cast<long long>(s.c_str())*1024*1024;
+      return boost::lexical_cast<long long>(numbers)*1024*1024;
     else if (s[p] == 'G') 
-      return boost::lexical_cast<long long>(s.c_str())*1024*1024*1024;
+      return boost::lexical_cast<long long>(numbers)*1024*1024*1024;
     else if (s[p] == 'T') 
-      return boost::lexical_cast<long long>(s.c_str())*1024*1024*1024*1024;
+      return boost::lexical_cast<long long>(numbers)*1024*1024*1024*1024;
     else
-      return boost::lexical_cast<long long>(s.c_str());
+      return boost::lexical_cast<long long>(numbers);
   }
 #define BKMG_RANGE _T("BKMGTP")

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,166
-#define STRPRODUCTVER  "0,4,0,166"
-#define STRPRODUCTDATE "2012-04-23"
+#define PRODUCTVER     0,4,0,170
+#define STRPRODUCTVER  "0,4,0,170"
+#define STRPRODUCTDATE "2012-05-03"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=166
-date=2012-04-23
+build=170
+date=2012-05-03