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

Timestamp:

Dec 3, 2004, 4:43:39 PM (22 years ago)

Author:

evanalst

Message:

Update psHashRemove.

File:

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

trunk/psLib/src/collections/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-04 00:04:33 $
+*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-04 02:43:39 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
 
 /******************************************************************************
-psHashFree(table, itemFree): This procedure deallocates the specified hash
+hashFree(table): This procedure deallocates the specified hash
 table.  It loops through each bucket, and calls hashBucketFree() on that
 bucket.
@@ -380 +380 @@
     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;
     }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
-        return NULL;
-    }
 
     return doHashWork(table, key, NULL, 0);
@@ -393 +393 @@
 
 /******************************************************************************
-psHashRemove(table, key, itemFree): this procedure, which is part of the
+psHashRemove(table, key): this procedure, which is part of the
 public API, removes the specified key from the hash table.
 Inputs:
     table: a hash table
     key: the key to remove
-    itemFree: a function pointer
 Return:
     boolean value defining success or failure
@@ -425 +424 @@
         retVal = false;
     }
+
     return retVal;
 }