Index: trunk/psLib/src/collections/psHash.c
===================================================================
--- trunk/psLib/src/collections/psHash.c	(revision 2221)
+++ trunk/psLib/src/collections/psHash.c	(revision 2273)
@@ -11,6 +11,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 23:31:43 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-04 01:04:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -228,7 +228,6 @@
     // the way this procedure is called.
     if ((table == NULL) || (key == NULL)) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "doHashWork",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_KEY_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_KEY_NULL);
         return NULL;
     }
@@ -249,5 +248,6 @@
     // anyway.
     if ((hash < 0) || (hash >= table->nbucket)) {
-        psError(__func__, "Internal hash function out of range (%d)", hash);
+        psError(PS_ERR_UNKNOWN, true,
+                "Internal hash function out of range (%d)", hash);
     }
     // ptr will have the correct hash bucket.
@@ -347,19 +347,16 @@
 {
     if (table == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_KEY_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_KEY_NULL);
         return false;
     }
     if (key == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
         return false;
     }
     if (data == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_DATA_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_DATA_NULL);
     }
 
@@ -382,13 +379,11 @@
 {
     if (table == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashLookup",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_KEY_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_KEY_NULL);
         return NULL;
     }
     if (key == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashLookup",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
         return NULL;
     }
@@ -414,13 +409,11 @@
 
     if (table == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashRemove",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
         return false;
     }
     if (key == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashRemove",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psHash_KEY_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_KEY_NULL);
         return false;
     }