Changeset 973 for cpp/frams/util/sstring.cpp

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

File:

• cpp/frams/util/sstring.cpp (modified) (6 diffs)

cpp/frams/util/sstring.cpp

@@ -163 +163 @@
 }
 
-void SString::memoryHint(int howbig)
-{
-        detachCopy(howbig);
-}
-
 void SString::detachEmpty(int ensuresize)
 {
@@ -201 +196 @@
 char *SString::directWrite(int ensuresize)
 {
-        if (ensuresize < 0) ensuresize = len();
+        if (ensuresize < 0) ensuresize = length();
         REF_LOCK;
         detachCopy(ensuresize);
@@ -259 +254 @@
 void SString::operator+=(const SString&s)
 {
-        append(s.c_str(), s.len());
+        append(s.c_str(), s.length());
 }
 
@@ -298 +293 @@
 ///////////////////////////////////////
 
-SString SString::substr(int begin, int length) const
-{
-        if (begin < 0) { length += begin; begin = 0; }
-        if (length >= (len() - begin)) length = len() - begin;
-        if (length <= 0) return SString();
-        if (length == len()) return *this;
-        return SString((*this)(begin), length);
+SString SString::substr(int begin, int numchars) const
+{
+        if (begin < 0) { numchars += begin; begin = 0; }
+        if (numchars >= (length() - begin)) numchars = length() - begin;
+        if (numchars <= 0) return SString();
+        if (numchars == length()) return *this;
+        return SString((*this)(begin), numchars);
 }
 
@@ -337 +332 @@
 bool SString::getNextToken(int& pos, SString &token, char separator) const
 {
-        if (pos >= len()) { token = 0; return false; }
+        if (pos >= length()) { token = 0; return false; }
         int p1 = pos, p2;
         const char *t1 = buf->txt + pos;
         const char *t2 = strchr(t1, separator);
-        if (t2) pos = (p2 = (t2 - buf->txt)) + 1; else p2 = pos = len();
+        if (t2) pos = (p2 = (t2 - buf->txt)) + 1; else p2 = pos = length();
         strncpy(token.directWrite(p2 - p1), t1, p2 - p1);
         token.endWrite(p2 - p1);
@@ -401 +396 @@
                 char* p = ret.directWrite(size);
                 assert(p != NULL);
-                size = ret.directMaxLen() + 1;
+                size = ret.capacity() + 1;
                 /* Try to print in the allocated space. */
                 va_start(ap, format);