optimize JoinInner()

sumatrapdfreader · May 24, 2024 · bff4bc0 · bff4bc0
1 parent 5e57138
commit bff4bc0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/utils/StrVec.cpp b/src/utils/StrVec.cpp
@@ -83,18 +83,22 @@ static int CalcCapForJoin(const StrVec& v, const char* joint) {
 
 static char* JoinInner(const StrVec& v, const char* joint, str::Str& res) {
     int len = v.Size();
-    size_t jointLen = str::Len(joint);
+    int jointLen = str::Leni(joint);
+    // TODO: possibly not handling null values in the middle. need to add more tests and fix
     int firstForJoint = 0;
-    for (int i = 0; i < len; i++) {
-        char* s = v.At(i);
-        if (!s) {
+    int i = 0;
+    for (auto it = v.begin(); it != v.end(); it++) {
+        auto s = it.Span();
+        if (!s.Str()) {
             firstForJoint++;
+            i++;
             continue;
         }
         if (i > firstForJoint && jointLen > 0) {
             res.Append(joint, jointLen);
         }
-        res.Append(s);
+        res.Append(s.Str(), s.Len());
+        i++;
     }
     return res.StealData();
 }