Changeset 29932

Timestamp:

Dec 5, 2010, 9:25:07 PM (15 years ago)

Author:

eugene

Message:

add psStringRealloc function

Location:

trunk/psLib/src/sys

Files:

• psString.c (modified) (1 diff)
• psString.h (modified) (2 diffs)

trunk/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;

trunk/psLib/src/sys/psString.h

@@ -40 +40 @@
 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__)
 
-
 /** Allocates a new psString.
  *
@@ -60 +59 @@
 #endif // ifdef DOXYGEN
 
+/** Reallocate an existing psString (or alloc if not existent)
+ *
+ *  @return psString:       string of length n.
+ */
+#ifdef DOXYGEN
+psString psStringRealloc(
+    psString string,
+    size_t nChar                        ///< Size of psString to allocate.
+);
+#else // ifdef DOXYGEN
+psString p_psStringRealloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psString string,                    ///< supplied string or NULL
+    size_t nChar                        ///< Size of psString to allocate.
+) PS_ATTR_MALLOC;
+#define psStringRealloc(string, nChar)                          \
+    p_psStringRealloc(__FILE__, __LINE__, __func__, string, nChar)
+#endif // ifdef DOXYGEN
 
 /** Checks the type of a particular pointer.