Changeset 15418 for branches/eam_branch_20071023/psModules/src/objects/pmModel.c

Timestamp:

Oct 29, 2007, 2:59:23 PM (19 years ago)

Author:

gusciora

Message:

Adding several changes to the objects directory. Most of these changes are
mere additions of PS_ASSERTs to the beginning of psModule functions to ensure
that input parameters are correct.

File:

• branches/eam_branch_20071023/psModules/src/objects/pmModel.c (modified) (4 diffs)

branches/eam_branch_20071023/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.15.6.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-29 01:37:48 $
+ *  @version $Revision: 1.15.6.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-30 00:59:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
     psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
 
-    pmModel *tmp = (pmModel *) psAlloc(sizeof(pmModel));
-    psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
-
     pmModelClass *class = pmModelClassSelect (type);
     if (class == NULL) {
@@ -54 +51 @@
         return(NULL);
     }
+
+    pmModel *tmp = (pmModel *) psAlloc(sizeof(pmModel));
+    psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
 
     tmp->type = type;
@@ -89 +89 @@
 }
 
+bool psMemCheckModel(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) modelFree);
+}
+
 // copy model to a new structure
 pmModel *pmModelCopy (pmModel *model)
 {
+    PS_ASSERT_PTR_NON_NULL(model, NULL);
 
     pmModel *new = pmModelAlloc (model->type);