Changeset 1413

Timestamp:

Aug 6, 2004, 2:33:36 PM (22 years ago)

Author:

desonia

Message:

fixed hashFree as to free all the buckets manually instead of relying on hashBucketFree, as that is used in item removal (which shouldn't go off deleting the next bucket).

File:

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

trunk/psLib/src/sysUtils/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-07 00:06:06 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-07 00:33:36 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
         return;
     }
-    // A bucket is actually a linked list of buckets.  We recursively step
-    // through that linked list, free each bucket.
-    psFree(bucket->next);
 
     psFree(bucket->key);
@@ -183 +180 @@
 
         // A bucket is composed of a linked list of buckets.
-        if (table->buckets[i] != NULL) {
-            psFree(table->buckets[i]);
+        while (table->buckets[i] != NULL) {
+            psHashBucket* bucket = table->buckets[i];
+            table->buckets[i] = bucket->next;
+            psFree(bucket);
         }
     }
@@ -263 +262 @@
             optr = ptr;
             while (ptr != NULL) {
-                // Dtermine if this entry holds the correct key.
+                // Determine if this entry holds the correct key.
                 if (strcmp(key, ptr->key) == 0) {
                     // The following lines of code are fairly standard ways
@@ -274 +273 @@
                         table->buckets[hash] = ptr->next;
                     }
-
                     psFree(ptr);