Index: trunk/psLib/src/collections/psHash.c
===================================================================
--- trunk/psLib/src/collections/psHash.c	(revision 3769)
+++ trunk/psLib/src/collections/psHash.c	(revision 4135)
@@ -9,9 +9,9 @@
 *
 *  @author Robert Lupton, Princeton University
-*  @author George Gusciora, MHPCC
 *  @author Robert DeSonia, MHPCC
+*  @author GLG, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-26 19:53:30 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-07 22:36:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -346,19 +346,7 @@
                  psPtr data)
 {
-    if (table == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
-        return false;
-    }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_KEY_NULL);
-        return false;
-    }
-    if (data == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_DATA_NULL);
-        return false;
-    }
+    PS_ASSERT_PTR_NON_NULL(table, false);
+    PS_ASSERT_PTR_NON_NULL(key, false);
+    PS_ASSERT_PTR_NON_NULL(data, false);
 
     return (doHashWork(table, key, data, false) != NULL);
@@ -379,14 +367,6 @@
                    const char *key)     // key to lookup
 {
-    if (table == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
-        return NULL;
-    }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_KEY_NULL);
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(table, false);
+    PS_ASSERT_PTR_NON_NULL(key, false);
 
     return doHashWork(table, key, NULL, false);
@@ -408,14 +388,6 @@
     psBool retVal = false;
 
-    if (table == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
-        return false;
-    }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_KEY_NULL);
-        return false;
-    }
+    PS_ASSERT_PTR_NON_NULL(table, false);
+    PS_ASSERT_PTR_NON_NULL(key, false);
 
     data = doHashWork(table, key, NULL, true);
@@ -431,10 +403,5 @@
 psArray* psHashToArray(psHash* table)
 {
-
-    if (table == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(table, NULL);
 
     // first, let's just count the number of data elements to know what size