Changeset 691 for cpp

Timestamp:

09/04/17 03:24:01 (7 years ago)

Author:

Maciej Komosinski

Message:

Support for reading/parsing and writing 64-bit integer values

Location:

cpp

Files:

• common/Convert.h (modified) (1 diff)
• frams/util/sstringutils.cpp (modified) (3 diffs)
• frams/util/sstringutils.h (modified) (2 diffs)

cpp/common/Convert.h

@@ -15 +15 @@
 typedef XY<double> Pt2D;
 
+#ifdef LINUX
+#define UINT64_FORMAT "%llu" //we want to avoid this and ambiguous "long long", but gcc does not seem to support I64u (yet?)
+#else
+#define UINT64_FORMAT "%I64u"
+#endif
 
 struct Convert

cpp/frams/util/sstringutils.cpp

@@ -7 +7 @@
 #include <common/log.h>
 #include <common/nonstd.h>
+#include <common/Convert.h>
 
 int loadSString(const char* filename, SString& s, const char* framsgmodule, const char* error, bool remove_cr)
@@ -19 +20 @@
         }
         else if (framsgmodule)
-                logPrintf(framsgmodule, "loadSString", LOG_WARN, error ? error : "can't open file \"%s\"", filename);
+                logPrintf(framsgmodule, "loadSString", LOG_WARN, error ? error : "Can't open file \"%s\"", filename);
         return ret;
 }
@@ -323 +324 @@
 }
 
+SString getUIDString(uint64_t uid, char prefix)
+{
+        return SString::sprintf("%c" UINT64_FORMAT, prefix, uid);
+}
+
+bool parseUIDString(const char* str, char prefix, uint64_t &uid, bool err)
+{
+        if ((str[0] == prefix) && (isdigit(str[1])))
+        {
+                char* end;
+                uid = strtoull(str + 1, &end, 10);
+                if (end == (str + 1 + strlen(str + 1)))
+                        return true;
+        }
+        if (err)
+                logPrintf("SString", "parseUIDString", LOG_ERROR, "Invalid uid: '%s'", str);
+        return false;
+}

cpp/frams/util/sstringutils.h

@@ -10 +10 @@
 
 /// return: 1=ok 0=error
-int loadSString(const char* filename, SString& s, const char* framsgmodule = 0, const char* error = 0, bool remove_cr=true);
-void loadSString(VirtFILE *f, SString& s, bool remove_cr=true);
+int loadSString(const char* filename, SString& s, const char* framsgmodule = 0, const char* error = 0, bool remove_cr = true);
+void loadSString(VirtFILE *f, SString& s, bool remove_cr = true);
 bool loadSStringLine(VirtFILE* f, SString &s);
 
@@ -30 +30 @@
 bool matchWildcard(const SString& word, const SString& pattern);///< '*' in pattern matches any substring
 bool matchWildcardList(const SString& word, const SString& patterns);///< patterns is a list of patterns (separated by ',')
+SString getUIDString(uint64_t uid, char prefix);
+bool parseUIDString(const char* str, char prefix, uint64_t &uid, bool err);
 
 #endif