Changeset 7901 for trunk/psLib/src/sys/psString.c

Timestamp:

Jul 13, 2006, 4:26:25 PM (20 years ago)

Author:

drobbin

Message:

Added str check test for error handling of psString fxns, namely stringSubstitute. Edited memory and type to include MemCheck's for string, line, and region. Added is_psType function to check for NULLs and native types first. <-will have to update all fxns next wrt to this change. Added psStringAlloc, stringFree, regionFree. Added doxygen comments.

File:

• trunk/psLib/src/sys/psString.c (modified) (3 diffs)

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-12 21:17:51 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-14 02:26:25 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 #include "psErrorText.h"
 
+static void stringFree(psString string)
+{
+    // There is non dynamic allocated item
+}
+
+psString psStringAlloc(long nChar)
+{
+    if (nChar < 1) {
+        return NULL;
+    }
+    psString string = psAlloc(nChar + 1);
+    psMemSetDeallocator(string, (psFreeFunc)stringFree);
+    return string;
+}
+
+bool psMemCheckString(psPtr ptr)
+{
+    if (!is_psType(ptr)) {
+        return false;
+    }
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc)stringFree );
+}
+
 psString psStringCopy(const char *string)
 {
@@ -231 +254 @@
         return input;
     }
+    if (!psMemCheckString(input)) {
+        return input;
+    }
+
 
     // replace == NULL is valid: it just means that we strip out the key