Changeset 9538 for trunk/psLib/src/mathtypes

Timestamp:

Oct 13, 2006, 11:13:48 AM (20 years ago)

Author:

Paul Price

Message:

Synchronising with SDRS, and cleaning up:

• Replaced is_psType() with PS_ASSERT_PTR() throughout psLib.
• Changed "char *" to "psString" where appropriate in psDB and a few other places (to indicate pointers on the PS memory system).
• Removed psLogArguments and psTraceArguments (functionality in psArgumentVerbosity).
• Renamed psMetadataLookupMD to psMetadataLookupMetadata (it was about time...). Similarly with the psPolynomial?D{From,To}MD functions.
• Removed psMetadataRemove() since it is ambiguous about what's removed --- use psMetadataRemove{Key,Index}.
• psArrayRemoveByPos --> psArrayRemoveIndex
• psArrayRemove --> psArrayRemoveData

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (3 diffs)
• psScalar.c (modified) (3 diffs)
• psVector.c (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
         int ref = ptr->refCounter;
         ptr->refCounter = 2;  // make sure psFree is not retriggered
-        psArrayRemove(image->parent->children,image);
+        psArrayRemoveData(image->parent->children,image);
         ptr->refCounter = ref; // restore previous count (not assuming zero, but should be)
 
@@ -110 +110 @@
 bool psMemCheckImage(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)imageFree );
 }

trunk/psLib/src/mathtypes/psScalar.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include "psLogMsg.h"
 #include "psAbort.h"
-
+#include "psAssert.h"
 
 
@@ -89 +89 @@
 bool psMemCheckScalar(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, NULL);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)scalarFree );
 }

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-26 04:34:28 $
+*  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-13 21:13:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psLogMsg.h"
 #include "psCompare.h"
-
+#include "psAssert.h"
 
 
@@ -63 +63 @@
 bool psMemCheckVector(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)vectorFree );
 }