Changeset 2212 for trunk/psLib/src/dataManip/psConstants.h

Timestamp:

Oct 27, 2004, 10:07:17 AM (22 years ago)

Author:

gusciora

Message:

I've been unifying the naming conventions for various macros that check
functions parameters for type, size, non-NULL ...

File:

• trunk/psLib/src/dataManip/psConstants.h (modified) (3 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 19:58:54 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:07:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -95 +95 @@
 
 /*****************************************************************************
- 
+Macros which take a generic psLib type and determine if it is NULL, or has
+the wrong type.
 *****************************************************************************/
-#define PS_CHECK_NULL_PTR(NAME, RVAL) \
+#define PS_PTR_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL) { \
     psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \
@@ -103 +104 @@
 }
 
-/*****************************************************************************
- 
- *****************************************************************************/
-#define VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \
+#define PS_PTR_CHECK_TYPE(NAME, TYPE, RVAL) \
+if (NAME->type.type != TYPE) { \
+    psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
+    return(RVAL); \
+}
+/*****************************************************************************
+ 
+ *****************************************************************************/
+#define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \
 if ((VEC->type.type != PS_TYPE_F32) && (VEC->type.type != PS_TYPE_F64)) { \
     psAbort(__func__, "Bad type for VEC (%d)", VEC->type.type); \