Changeset 9578

Timestamp:

Oct 13, 2006, 5:50:28 PM (20 years ago)

Author:

Paul Price

Message:

Adding assertions for metadata and string.

Location:

trunk/psLib/src

Files:

• sys/psString.h (modified) (3 diffs)
• types/psMetadata.h (modified) (2 diffs)

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 00:32:39 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 03:50:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
 ) __attribute__((format(printf, 2, 3)));
 # else // __GNUC__
+
     ssize_t psStringPrepend(
         char **dest,                        ///< existing string
@@ -206 +207 @@
 );
 
+
+#define PS_ASSERT_STRING_NON_EMPTY(NAME, RVAL) \
+if (!(NAME) || strlen(NAME) == 0) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: String %s is NULL or empty.", \
+            #NAME); \
+    return(RVAL); \
+}
+
+
 /** @} */// Doxygen - End of SystemGroup Functions
 

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-13 22:42:28 $
+*  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-14 03:50:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1189 +1189 @@
 
 
+/// Assert on metadata with extant hash and list components
+#define PS_ASSERT_METADATA_NON_NULL(NAME, RVAL) \
+if (!(NAME) || !(NAME)->hash || !(NAME)->list) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: Metadata %s or one of its components is NULL.", \
+            #NAME); \
+    return(RVAL); \
+}
+
+
 /// @}