Changeset 7416

Timestamp:

2004-05-25T11:15:11+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Changed iterators from here++ to ++here, and allocated memory for arrays a little better.

File:

• trunk/gsdl/src/mgpp/text/UCArray.cpp (modified) (7 diffs)

trunk/gsdl/src/mgpp/text/UCArray.cpp

@@ -66 +66 @@
   while (here != end) {
     s << *here;
-    here++;
+    ++here;
   }
 
@@ -146 +146 @@
   if (!ReadVarLenUL (f, arraySize)) return false;
 
+  // reserve the needed space in advance
+  if (a.capacity() < arraySize + 1) {
+    a.reserve(arraySize + 1);
+  }
+
   // read in the array
   unsigned char b = 0;
@@ -169 +174 @@
     if (ferror (f) != 0) return false;
     
-    here++;
+    ++here;
   }
   
@@ -232 +237 @@
       pos = diff;
 
-    a1Here++;
-    a2Here++;
+    ++a1Here;
+    ++a2Here;
   }
 
@@ -247 +252 @@
 
   while (i < l && *a1Here == *a2Here) {
-    i++; a1Here++; a2Here++;
+    i++; ++a1Here; ++a2Here;
   }
   
@@ -268 +273 @@
   char* tmp=GetCStr(a);
   int ret=(fwrite (tmp+preLen, sizeof (char), sufLen, f) == sufLen);
-  delete (tmp);
-  return (ret);
+  delete []tmp;
+  return (ret != 0);
 }
 
@@ -280 +285 @@
   sufLen = fgetc(f);
 
-  if (a.size () > preLen) a.erase (a.begin()+preLen, a.end());
+  if (a.size() > preLen) a.erase (a.begin()+preLen, a.end());
+
+  // reserve the needed space in advance
+  if (a.capacity() < a.size() + sufLen + 1) {
+    a.reserve(a.size() + sufLen + 1);
+  }
+
   while (sufLen > 0) {
     unsigned char c = fgetc (f);