Index: /trunk/psLib/src/collections/psHash.c
===================================================================
--- /trunk/psLib/src/collections/psHash.c	(revision 4351)
+++ /trunk/psLib/src/collections/psHash.c	(revision 4352)
@@ -12,6 +12,6 @@
 *  @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,13 +343,13 @@
     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,11 +365,11 @@
     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,5 +383,5 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashRemove(psHash* table,
+bool psHashRemove(psHash* hash,
                   const char *key)
 {
@@ -389,8 +389,8 @@
     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,14 +402,14 @@
 }
 
-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,8 +421,8 @@
     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);
Index: /trunk/psLib/src/collections/psHash.h
===================================================================
--- /trunk/psLib/src/collections/psHash.h	(revision 4351)
+++ /trunk/psLib/src/collections/psHash.h	(revision 4352)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 03:00:27 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 23:48:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52,5 +52,5 @@
 /// Insert entry into table.
 bool psHashAdd(
-    psHash* table,                     ///< The table to insert in.
+    psHash* hash,                      ///< The table to insert in.
     const char *key,                   ///< The key to use.
     psPtr data                         ///< The data to insert.
@@ -59,5 +59,5 @@
 /// Lookup key in table.
 psPtr psHashLookup(
-    const psHash* table,               ///< The table to lookup key in.
+    const psHash* hash,                ///< The table to lookup key in.
     const char *key                    ///< The key to lookup.
 );
@@ -65,5 +65,5 @@
 /// Remove key from table.
 bool psHashRemove(
-    psHash* table,                     ///< The table to lookup key in.
+    psHash* hash,                      ///< The table to lookup key in.
     const char *key                    ///< The key to lookup.
 );
@@ -79,5 +79,5 @@
  */
 psArray* psHashToArray(
-    const psHash* table                ///< The table to convert to psArray.
+    const psHash* hash                 ///< The table to convert to psArray.
 );
 
Index: /trunk/psLib/src/types/psHash.c
===================================================================
--- /trunk/psLib/src/types/psHash.c	(revision 4351)
+++ /trunk/psLib/src/types/psHash.c	(revision 4352)
@@ -12,6 +12,6 @@
 *  @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,13 +343,13 @@
     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,11 +365,11 @@
     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,5 +383,5 @@
     boolean value defining success or failure
  *****************************************************************************/
-bool psHashRemove(psHash* table,
+bool psHashRemove(psHash* hash,
                   const char *key)
 {
@@ -389,8 +389,8 @@
     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,14 +402,14 @@
 }
 
-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,8 +421,8 @@
     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);
Index: /trunk/psLib/src/types/psHash.h
===================================================================
--- /trunk/psLib/src/types/psHash.h	(revision 4351)
+++ /trunk/psLib/src/types/psHash.h	(revision 4352)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 03:00:27 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 23:48:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52,5 +52,5 @@
 /// Insert entry into table.
 bool psHashAdd(
-    psHash* table,                     ///< The table to insert in.
+    psHash* hash,                      ///< The table to insert in.
     const char *key,                   ///< The key to use.
     psPtr data                         ///< The data to insert.
@@ -59,5 +59,5 @@
 /// Lookup key in table.
 psPtr psHashLookup(
-    const psHash* table,               ///< The table to lookup key in.
+    const psHash* hash,                ///< The table to lookup key in.
     const char *key                    ///< The key to lookup.
 );
@@ -65,5 +65,5 @@
 /// Remove key from table.
 bool psHashRemove(
-    psHash* table,                     ///< The table to lookup key in.
+    psHash* hash,                      ///< The table to lookup key in.
     const char *key                    ///< The key to lookup.
 );
@@ -79,5 +79,5 @@
  */
 psArray* psHashToArray(
-    const psHash* table                ///< The table to convert to psArray.
+    const psHash* hash                 ///< The table to convert to psArray.
 );