Changeset 7901 for trunk/psLib/src/sys/psMemory.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/psMemory.c (modified) (6 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-21 21:40:12 $
+*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-07-14 02:26:25 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 #include "psAbort.h"
 #include "psLogMsg.h"
-
 #include "psBitSet.h"
-//#include "psArray.h"
-//#include "psImage.h"
-//#include "psList.h"
-//#include "psLookupTable.h"
-//#include "psHash.h"
-
-//#include "psMetadata.h"
 #include "psFits.h"
 #include "psPixels.h"
-//#include "psScalar.h"
-//#include "psVector.h"
-//#include "psTime.h"
-//#include "psCoord.h"
 #include "psSphereOps.h"
-//#include "psStats.h"
 #include "psMinimizeLMM.h"
 #include "psImageConvolve.h"
 #include "psTime.h"
-
+#include "psLine.h"
+#include "psRegion.h"
 #include "psErrorText.h"
 
@@ -837 +825 @@
 }
 
+bool is_psType(psPtr ptr)
+{
+    if (ptr == NULL) {
+        return false;
+    }
+    psMemBlock* m = ((psMemBlock* ) ptr) - 1;
+    if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
+        return false; //Probably not a psAllocated-Type
+    } else {
+        return true;
+    }
+}
+
 bool psMemCheckType(psDataType type,
                     psPtr ptr)
 {
+    if (!is_psType(ptr)) {
+        return false;
+    }
+
     switch(type) {
     case PS_DATA_ARRAY:
@@ -905 +910 @@
             break;
         }
+    case PS_DATA_LINE:
+        if ( psMemCheckLine(ptr) )
+            return true;
+        else {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "Incorrect pointer.  Datatypes do not match.\n");
+            break;
+        }
     case PS_DATA_LIST:
         if ( psMemCheckList(ptr) )
@@ -1017 +1030 @@
             break;
         }
+    case PS_DATA_REGION:
+        if ( psMemCheckRegion(ptr) )
+            return true;
+        else {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "Incorrect pointer.  Datatypes do not match.\n");
+            break;
+        }
     case PS_DATA_SCALAR:
         if ( psMemCheckScalar(ptr) )
@@ -1051 +1072 @@
     case PS_DATA_STATS:
         if ( psMemCheckStats(ptr) )
+            return true;
+        else {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "Incorrect pointer.  Datatypes do not match.\n");
+            break;
+        }
+    case PS_DATA_STRING:
+        if ( psMemCheckString(ptr) )
             return true;
         else {