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

Timestamp:

Jun 22, 2005, 1:48:39 PM (21 years ago)

Author:

desonia

Message:

changed parameters of the name 'table' to 'hash'.

File:

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

trunk/psLib/src/collections/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-22 03:00:27 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-22 23:48:39 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -343 +343 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashAdd(psHash* table,
+bool psHashAdd(psHash* hash,
                const char *key,
                psPtr data)
 {
-    PS_ASSERT_PTR_NON_NULL(table, false);
+    PS_ASSERT_PTR_NON_NULL(hash, false);
     PS_ASSERT_PTR_NON_NULL(key, false);
     PS_ASSERT_PTR_NON_NULL(data, false);
 
-    return (doHashWork(table, key, data, false) != NULL);
+    return (doHashWork(hash, key, data, false) != NULL);
 }
 
@@ -365 +365 @@
     The data associated with that key.
  *****************************************************************************/
-psPtr psHashLookup(const psHash* table,      // table to lookup key in
+psPtr psHashLookup(const psHash* hash,      // hash to lookup key in
                    const char *key)     // key to lookup
 {
-    PS_ASSERT_PTR_NON_NULL(table, NULL);
+    PS_ASSERT_PTR_NON_NULL(hash, NULL);
     PS_ASSERT_PTR_NON_NULL(key, NULL);
 
-    return doHashWork((psPtr)table, key, NULL, false);
+    return doHashWork((psPtr)hash, key, NULL, false);
 }
 
@@ -383 +383 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashRemove(psHash* table,
+bool psHashRemove(psHash* hash,
                   const char *key)
 {
@@ -389 +389 @@
     psBool retVal = false;
 
-    PS_ASSERT_PTR_NON_NULL(table, false);
+    PS_ASSERT_PTR_NON_NULL(hash, false);
     PS_ASSERT_PTR_NON_NULL(key, false);
 
-    data = doHashWork(table, key, NULL, true);
+    data = doHashWork(hash, key, NULL, true);
     if (data != NULL) {
         retVal = true;
@@ -402 +402 @@
 }
 
-psArray* psHashToArray(const psHash* table)
-{
-    PS_ASSERT_PTR_NON_NULL(table, NULL);
+psArray* psHashToArray(const psHash* hash)
+{
+    PS_ASSERT_PTR_NON_NULL(hash, NULL);
 
     // first, let's just count the number of data elements to know what size
     // psArray we need to allocate.
     int nElements = 0;
-    int nbucket = table->nbucket;
+    int nbucket = hash->nbucket;
     for (int i = 0; i < nbucket; i++) {
-        psHashBucket* tmpBucket = table->buckets[i];
+        psHashBucket* tmpBucket = hash->buckets[i];
         while (tmpBucket != NULL) {
             nElements++;
@@ -421 +421 @@
     result->n = nElements;
 
-    // now fill in the array with the hash table's data
+    // now fill in the array with the hash hash's data
     psPtr* data = result->data;
     for (int i = 0; i < nbucket; i++) {
-        psHashBucket* tmpBucket = table->buckets[i];
+        psHashBucket* tmpBucket = hash->buckets[i];
         while (tmpBucket != NULL) {
             *(data++) = psMemIncrRefCounter(tmpBucket->data);