xrCore/xr_trims: support xr_string for _GetItems()

OpenXRay · Mar 5, 2018 · d622b6e · d622b6e
1 parent 2b3140e
commit d622b6e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/xrCore/xr_trims.cpp b/src/xrCore/xr_trims.cpp
@@ -108,6 +108,21 @@ LPSTR _GetItems(LPCSTR src, int idx_start, int idx_end, LPSTR dst, char separato
     return dst;
 }
 
+pcstr _GetItems(pcstr src, int idx_start, int idx_end, xr_string& dst, char separator)
+{
+    int level = 0;
+    for (pcstr p = src; *p != 0; p++)
+    {
+        if ((level >= idx_start) && (level < idx_end))
+            dst += *p;
+        if (*p == separator)
+            level++;
+        if (level >= idx_end)
+            break;
+    }
+    return dst.c_str();
+}
+
 u32 _ParseItem(LPCSTR src, xr_token* token_list)
 {
     for (int i = 0; token_list[i].name; i++)
@@ -270,20 +285,7 @@ LPCSTR _CopyVal(LPCSTR src, AnsiString& dst, char separator)
     return dst.c_str();
 }
 
-LPCSTR _GetItems(LPCSTR src, int idx_start, int idx_end, AnsiString& dst, char separator)
-{
-    int level = 0;
-    for (LPCSTR p = src; *p != 0; p++)
-    {
-        if ((level >= idx_start) && (level < idx_end))
-            dst += *p;
-        if (*p == separator)
-            level++;
-        if (level >= idx_end)
-            break;
-    }
-    return dst.c_str();
-}
+
 
 LPCSTR _GetItem(LPCSTR src, int index, AnsiString& dst, char separator, LPCSTR def, bool trim)
 {

diff --git a/src/xrCore/xr_trims.h b/src/xrCore/xr_trims.h
@@ -12,7 +12,6 @@ using string64Vec = xr_vector<string64>;
 #ifdef __BORLANDC__
 XRCORE_API AnsiString& _Trim(AnsiString& str);
 XRCORE_API LPCSTR _GetItem(LPCSTR src, int, AnsiString& p, char separator = ',', LPCSTR = "", bool trim = true);
-XRCORE_API LPCSTR _GetItems(LPCSTR src, int idx_start, int idx_end, AnsiString& dst, char separator);
 XRCORE_API LPCSTR _CopyVal(LPCSTR src, AnsiString& dst, char separator = ',');
 XRCORE_API AnsiString _ListToSequence(const AStringVec& lst);
 XRCORE_API AnsiString _ListToSequence2(const AStringVec& lst);
@@ -32,6 +31,7 @@ inline LPSTR _GetItem(
 }
 
 XRCORE_API LPSTR _GetItems(LPCSTR, int, int, LPSTR, char separator = ',');
+XRCORE_API pcstr _GetItems(pcstr, int, int, xr_string&, char);
 XRCORE_API LPCSTR _SetPos(LPCSTR src, u32 pos, char separator = ',');
 XRCORE_API LPCSTR _CopyVal(LPCSTR src, LPSTR dst, char separator = ',');
 XRCORE_API LPSTR _Trim(LPSTR str);