Changeset 30118 for branches/czw_branch/20101203/psLib/src/sys/psString.c

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psLib/src/sys/psString.c (modified) (1 diff)

branches/czw_branch/20101203/psLib/src/sys/psString.c

@@ -48 +48 @@
     psString string = p_psAlloc(file, lineno, func, nChar + 1);
     psMemSetDeallocator(string, (psFreeFunc)stringFree);
+
+    return string;
+}
+
+
+psString p_psStringRealloc(const char *file,
+                           unsigned int lineno,
+                           const char *func,
+                           psString string,
+                           size_t nChar)
+{
+    if (!string) {
+        string = p_psAlloc(file, lineno, func, nChar + 1);
+        psMemSetDeallocator(string, (psFreeFunc)stringFree);
+    } else {
+        string = p_psRealloc(file, lineno, func, string, nChar + 1);
+    }
 
     return string;