Changeset 1375

Timestamp:

Aug 3, 2004, 3:21:33 PM (22 years ago)

Author:

harman

Message:

Removed recursive psFree and memory errors caused by deleting the same pointer twice

File:

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

trunk/psLib/src/sysUtils/psHash.c

@@ -9 +9 @@
 *  @author Robert Lupton, Princeton University
 *  @author George Gusciora, MHPCC
-*   
-*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-02 22:31:02 $
+*
+*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-04 01:21:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     table: a hash table
 Return;
-    The linked list 
+    The linked list
  *****************************************************************************/
 psList *psHashKeyList( psHash *table )
@@ -114 +114 @@
 /******************************************************************************
 hashBucketFree(bucket): This procedure deallocates the specified
-hash bucket.  
+hash bucket.
 Inputs:
     bucket: the hash bucket to be freed.
@@ -144 +144 @@
     The new hash table.
  *****************************************************************************/
-psHash *psHashAlloc( int nbucket )  // initial number of buckets
+psHash *psHashAlloc( int nbucket )   // initial number of buckets
 {
     int i = 0;   // loop index variable
@@ -181 +181 @@
 static void hashFree( psHash *table )
 {
-    psHashBucket * tmp = NULL;           // Used to step through linked list.
-    psHashBucket *ptr = NULL;           // Used to step through linked list.
     int i = 0;                          // Loop index variable.
     
@@ -191 +189 @@
     // Loop through each bucket in the hash table.  If that bucket is not
     // NULL, then free the bucket via a function call to hashBucketFree();
-    
     for ( i = 0; i < table->nbucket; i++ ) {
-            // A bucket is composed of a linked list of buckets.  We use the
-            // "tmp" and "ptr" pointers to step through that list and free each
-            // non-NULL bucket.
-            
+    
+            // A bucket is composed of a linked list of buckets.
             if ( table->buckets[ i ] != NULL ) {
-                    ptr = table->buckets[ i ];
-                    while ( ptr != NULL ) {
-                            tmp = ptr->next;
-                            psFree( ptr );
-                            ptr = tmp;
-                        }
+                    psFree( table->buckets[ i ] );
                 }
         }
@@ -359 +349 @@
     itemFree: a function pointer
 Return:
-    boolean value defining success or failure 
+    boolean value defining success or failure
  *****************************************************************************/
 bool psHashAdd( psHash *table, const char *key, void *data )
@@ -387 +377 @@
     The data associated with that key.
  *****************************************************************************/
-void *psHashLookup( psHash *table,    // table to lookup key in
-                    const char *key )  // key to lookup
+void *psHashLookup( psHash *table,     // table to lookup key in
+                    const char *key )   // key to lookup
 {
     if ( table == NULL ) {