Changeset 4315 for trunk/psLib/src/types

Timestamp:

Jun 17, 2005, 4:30:50 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/types

Files:

• psHash.c (modified) (7 diffs)
• psHash.h (modified) (3 diffs)

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-07 22:37:52 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-18 02:30:49 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -43 +43 @@
     The linked list
  *****************************************************************************/
-psList* psHashKeyList(psHash* table)
+psList* psHashKeyList(const psHash* hash)
 {
     psS32 i = 0;                  // Loop index variable
@@ -49 +49 @@
     psHashBucket* ptr = NULL;   // Used to step thru linked list.
 
-    if (table == NULL) {
+    if (hash == NULL) {
         return NULL;
     }
@@ -57 +57 @@
     // Loop through every bucket in the hash table.  If that bucket is not
     // NULL, then add the bucket's key to the linked list.
-    for (i = 0; i < table->nbucket; i++) {
-        if (table->buckets[i] != NULL) {
+    for (i = 0; i < hash->nbucket; i++) {
+        if (hash->buckets[i] != NULL) {
             // Since a bucket contains a linked list of keys/data, we must
             // step trough each key in that linked list:
 
-            ptr = table->buckets[i];
+            ptr = hash->buckets[i];
             while (ptr != NULL) {
                 psListAdd(myLinkList, PS_LIST_HEAD, ptr->key);
@@ -135 +135 @@
     The new hash table.
  *****************************************************************************/
-psHash* psHashAlloc(psS32 nbucket)        // initial number of buckets
+psHash* psHashAlloc(long nalloc)        // initial number of buckets
 {
     psS32 i = 0;                  // loop index variable
@@ -145 +145 @@
 
     // Allocate memory for the buckets.
-    table->buckets = psAlloc(nbucket * sizeof(psHashBucket* ));
-    table->nbucket = nbucket;
-
-    psTrace("utils.hash", 1, "Creating %d-element hash table\n", nbucket);
+    table->buckets = psAlloc(nalloc * sizeof(psHashBucket* ));
+    table->nbucket = nalloc;
+
+    psTrace("utils.hash", 1, "Creating %d-element hash table\n", nalloc);
 
     // Initialize all buckets to NULL.
-    for (i = 0; i < nbucket; i++)
+    for (i = 0; i < nalloc; i++)
     {
         table->buckets[i] = NULL;
@@ -383 +383 @@
     boolean value defining success or failure
  *****************************************************************************/
-psBool psHashRemove(psHash* table,
-                    const char *key)
+bool psHashRemove(psHash* table,
+                  const char *key)
 {
     psPtr data = NULL;

trunk/psLib/src/types/psHash.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 02:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47 +47 @@
 /// Allocate hash buckets in table.
 psHash* psHashAlloc(
-    psS32 nbucket                  ///< The number of buckets to allocate.
+    long nalloc                        ///< The number of buckets to allocate.
 );
 
 /// Insert entry into table.
 psBool psHashAdd(
-    psHash* table,                 ///< The table to insert in.
-    const char *key,               ///< The key to use.
-    psPtr data                     ///< The data to insert.
+    psHash* table,                     ///< The table to insert in.
+    const char *key,                   ///< The key to use.
+    psPtr data                         ///< The data to insert.
 );
 
 /// Lookup key in table.
 psPtr psHashLookup(
-    psHash* table,                 ///< The table to lookup key in.
-    const char *key                ///< The key to lookup.
+    psHash* table,                     ///< The table to lookup key in.
+    const char *key                    ///< The key to lookup.
 );
 
 /// Remove key from table.
-psBool psHashRemove(
-    psHash* table,                 ///< The table to lookup key in.
-    const char *key                ///< The key to lookup.
+bool psHashRemove(
+    psHash* table,                     ///< The table to lookup key in.
+    const char *key                    ///< The key to lookup.
 );
 
 /// List all keys in table.
 psList* psHashKeyList(
-    psHash* table                  ///< The table to list keys from..
+    const psHash* hash                 ///< The table to list keys from..
 );
 
@@ -79 +79 @@
  */
 psArray* psHashToArray(
-    psHash* table                  ///< The table to convert to psArray.
+    psHash* table                 ///< The table to convert to psArray.
 );