Changeset 348 for cpp/frams/util/sstringutils.cpp

Timestamp:

04/09/15 23:51:28 (9 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

File:

• cpp/frams/util/sstringutils.cpp (modified) (10 diffs)

cpp/frams/util/sstringutils.cpp

@@ -63 +63 @@
 int quoteTilde(SString &target)
 {
-        const char* x = target;
+        const char* x = target.c_str();
         SString tmp;
         char *f;
@@ -88 +88 @@
 int unquoteTilde(SString &target)
 {
-        const char* x = target;
+        const char* x = target.c_str();
         SString tmp;
         char *f;
@@ -134 +134 @@
 bool sstringQuote(SString& target)
 {
-        const char* x = target;
+        const char* x = target.c_str();
         bool changed = 0;
         SString tmp;
@@ -169 +169 @@
 int sstringUnquote(SString &target)
 {
-        const char* x = target;
+        const char* x = target.c_str();
         SString tmp;
         char *f;
@@ -200 +200 @@
 int strFindField(const SString& txt, const SString& name, int &end)
 {
-        const char* t = txt, *n;
+        const char* t = txt.c_str(), *n;
         int pos = 0;
         while (1)
         {
                 n = strchr(t + pos, ',');
-                if ((!strncmp(t + pos, name, name.len())) && (t[pos + name.len()] == '='))
+                if ((!strncmp(t + pos, name.c_str(), name.len())) && (t[pos + name.len()] == '='))
                 {
                         if (n) end = n - t; else end = txt.len();
@@ -234 +234 @@
                 char *b = t;
                 if (txt.len()) *(t++) = ',';
-                strcpy(t, name); t += name.len();
+                strcpy(t, name.c_str()); t += name.len();
                 *(t++) = '=';
-                strcpy(t, value); t += value.len();
+                strcpy(t, value.c_str()); t += value.len();
                 txt.endAppend(t - b);
         }
@@ -253 +253 @@
                         char *t = txt.directWrite(txt.len() + value.len() - (e - p));
                         memmove(t + p + value.len(), t + e, txt.len() - e);
-                        memmove(t + p, value, value.len());
+                        memmove(t + p, value.c_str(), value.len());
                         txt.endWrite(txt.len() + value.len() - (e - p));
                 }
@@ -261 +261 @@
 SString trim(SString& s)
 {
-        const unsigned char*b = (const unsigned char*)(const char*)s;
+        const unsigned char*b = (const unsigned char*)s.c_str();
         const unsigned char*e = b + s.len();
         while ((b < e) && (*b <= ' ')) b++;
@@ -275 +275 @@
 bool removeCR(SString& s)
 {
-        const char* p = (const char*)s;
+        const char* p = s.c_str();
         const char* cr = strchr(p, '\r');
         if (!cr) return false;
@@ -299 +299 @@
                 SString after = pattern.substr(aster + 1);
                 if (!word.len()) return false;
-                if (before.len()) if (!word.startsWith(before)) return false;
+                if (before.len()) if (!word.startsWith(before.c_str())) return false;
                 if (after.len())
                         if ((word.len() < after.len())
-                                || (strcmp((const char*)after, ((const char*)word) + word.len() - after.len())))
+                                || (strcmp(after.c_str(), word.c_str() + word.len() - after.len())))
                                 return false;
                 return true;