Changeset 815 for trunk/superstring/source/allocator.c

Timestamp:

03/28/08 22:32:22 (4 years ago)

Author:

wd

Message:

Interrim update for superstring bits.

File:

• trunk/superstring/source/allocator.c (modified) (3 diffs)

trunk/superstring/source/allocator.c

@@ -49 +49 @@
 
 /* This function will grow the data pointed to by an ss_internal structure
- * as need-be.  It will also correctly handle structure type transitioning.  */
-int ss_grow(ss_internal *istr) {
+ * as need-be.  It will also correctly handle structure type transitioning
+ * and assign the correct memory address to 'outstr' (if provided) */
+int ss_grow(ss_internal *istr, superstring *outstr) {
     size_t grow;
     size_t memsize;
@@ -115 +116 @@
     }
 
-    /* map in the updated values */
+    /* map in the updated values.  Mostly we can do this by calling
+     * ssi_to_ss, but we also need to update the data pointer of istr to
+     * reflect the new address of the data. */
     ssi_to_ss(istr, istr->str);
+    istr->data = ss_cstring(str);
+    if (outstr != NULL)
+        *outstr = istr->str;
+
     ss_returnerror(SS_ERROR_SUCCESS);
 }
@@ -151 +158 @@
     istr.size = size;
 
-    if (ss_grow(&istr) != SS_ERROR_SUCCESS)
+    if (ss_grow(&istr, NULL) != SS_ERROR_SUCCESS)
         return NULL;
 
     /* Copy our data in */
-    cstr = ss_cstring(istr.str);
+    cstr = (unsigned char *)ss_cstring(istr.str);
     memcpy((void *)cstr, value, istr.len);
     cstr[istr.len] = '\0';