Changeset 1419

Timestamp:

Aug 9, 2004, 10:21:16 AM (22 years ago)

Author:

harman

Message:

Minor corrections from testing

Location:

trunk/psLib

Files:

• src/sysUtils/psHash.c (modified) (2 diffs)
• test/astronomy/tst_psMetadata_03.c (modified) (2 diffs)
• test/collections/tst_psMetadata_03.c (modified) (2 diffs)
• test/sysUtils/tst_psHash03.c (modified) (3 diffs)

trunk/psLib/src/sysUtils/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-07 00:33:36 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 20:21:16 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -401 +401 @@
     data = doHashWork(table, key, NULL, 1);
     if (data != NULL) {
-        psFree(data);
         retVal = true;
     } else {

trunk/psLib/test/astronomy/tst_psMetadata_03.c

@@ -14 +14 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-09 19:31:00 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-09 20:20:02 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -125 +125 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test G - Free psMetadata");
     psFree(metadata);
+    psFree(item1);
+    psFree(item2);
+    psFree(item3);
+    psFree(item4);
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);

trunk/psLib/test/collections/tst_psMetadata_03.c

@@ -14 +14 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-09 19:31:00 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-09 20:20:02 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -125 +125 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test G - Free psMetadata");
     psFree(metadata);
+    psFree(item1);
+    psFree(item2);
+    psFree(item3);
+    psFree(item4);
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);

trunk/psLib/test/sysUtils/tst_psHash03.c

@@ -70 +70 @@
     bool retVal         = false;
     ID *id = NULL;
+    ID *ids[4];
     char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL
                      };
@@ -86 +87 @@
     i = 0;
     while (myKeys[i] != NULL) {
-        psHashAdd(myHashTable, myKeys[i], IdAlloc(myData[i]));
+        ids[i] = IdAlloc(myData[i]);
+        psHashAdd(myHashTable, myKeys[i], ids[i]);
         i++;
     }
@@ -124 +126 @@
 
     psFree(myHashTable);
+    for(i=0; i<(TotalKeys+1); i++) {
+        psFree(ids[i]);
+    }
     memLeaks = psMemCheckLeaks(currentId,NULL,stdout);
     if (0 != memLeaks) {