Changeset 1841 for trunk/psLib/src/collections/psHash.c

Timestamp:

Sep 21, 2004, 1:15:04 PM (22 years ago)

Author:

desonia

Message:

removed some unnecessary psAborts, replacing them with psErrorMsg(...).

File:

• trunk/psLib/src/collections/psHash.c (modified) (7 diffs)

trunk/psLib/src/collections/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-09 02:23:27 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-21 23:15:04 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 #include "psString.h"
 #include "psTrace.h"
+#include "psError.h"
 #include "psAbort.h"
+
+#include "psCollectionsErrors.h"
 
 static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next);
@@ -83 +86 @@
 static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next)
 {
-    if (key == NULL) {
-        psAbort(__func__, "psHashBucket() called with NULL key.");
-    }
     // Allocate memory for the new hash bucket.
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
@@ -226 +226 @@
     // the way this procedure is called.
     if ((table == NULL) || (key == NULL)) {
-
-        psAbort(__func__, "psHashRemove() called with NULL key or table.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "doHashWork",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_KEY_NULL);
+        return NULL;
     }
     // NOTE: This is the originally supplied hash function.
@@ -341 +343 @@
 {
     if (table == NULL) {
-        psAbort(__func__, "psHashInsert() called with NULL hash table.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_KEY_NULL);
+        return false;
     }
     if (key == NULL) {
-        psAbort(__func__, "psHashInsert() called with NULL key.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        return false;
     }
     if (data == NULL) {
-        psAbort(__func__, "psHashLookup() called with NULL data.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashAdd",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_DATA_NULL);
     }
 
@@ -368 +378 @@
 {
     if (table == NULL) {
-        psAbort(__func__, "psHashLookup() called with NULL hash table.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashLookup",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_KEY_NULL);
+        return NULL;
     }
     if (key == NULL) {
-        psAbort(__func__, "psHashLookup() called with NULL key.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashLookup",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        return NULL;
     }
 
@@ -393 +409 @@
 
     if (table == NULL) {
-        psAbort(__func__, "psHashRemove() called with NULL hash table.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashRemove",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_TABLE_NULL);
+        return false;
     }
     if (key == NULL) {
-        psAbort(__func__, "psHashRemove() called with NULL key.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psHashRemove",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psHash_KEY_NULL);
+        return false;
     }