Index: /trunk/psLib/src/sys/psLogMsg.c =================================================================== --- /trunk/psLib/src/sys/psLogMsg.c (revision 8667) +++ /trunk/psLib/src/sys/psLogMsg.c (revision 8668) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-08-25 22:06:08 $ + * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-29 20:23:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -351,4 +351,5 @@ line = strtok_r(NULL, "\n", &msgPtr); } + psFree(msg); } else { write(logFD, "\n", 1); Index: /trunk/psLib/src/types/psHash.c =================================================================== --- /trunk/psLib/src/types/psHash.c (revision 8667) +++ /trunk/psLib/src/types/psHash.c (revision 8668) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-08-26 04:34:28 $ +* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-29 20:23:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 8667) +++ /trunk/psLib/src/types/psMetadata.c (revision 8668) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.129 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-08-26 04:34:28 $ + * @version $Revision: 1.130 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-29 20:23:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -267,5 +267,5 @@ { char *string = va_arg(argPtr, char *); - metadataItem->data.V = + metadataItem->data.str = string ? psStringNCopy(string, MAX_STRING_LENGTH) : NULL; @@ -1441,6 +1441,4 @@ psMetadata *folder = psMetadataAlloc (); - psMetadataAdd (md, PS_LIST_TAIL, root, PS_DATA_METADATA, "folder for 2D polynomial", folder); - psFree (root); // specify the polynomial orders @@ -1459,4 +1457,7 @@ } } + psMetadataAdd (md, PS_LIST_TAIL, root, PS_DATA_METADATA, "folder for 2D polynomial", folder); + psFree (root); + psFree(folder); return true; } Index: /trunk/psLib/test/types/Makefile.am =================================================================== --- /trunk/psLib/test/types/Makefile.am (revision 8667) +++ /trunk/psLib/test/types/Makefile.am (revision 8668) @@ -7,6 +7,4 @@ TESTS = \ - tst_psArray \ - tst_psBitSet \ tst_psHash00 \ tst_psHash01 \ @@ -14,7 +12,4 @@ tst_psHash03 \ tst_psHash04 \ - tst_psHash05 \ - tst_psList \ - tst_psLookupTable_01 \ tst_psMetadata_01 \ tst_psMetadata_02 \ @@ -24,5 +19,4 @@ tst_psMetadata_06 \ tst_psMetadata_07 \ - tst_psMetadataIO \ tst_psPixels \ tst_psArguments \ @@ -38,8 +32,14 @@ tap_psMetadata_polynomials \ tap_psArray_all +# tst_psArray +# tst_psBitSet +# tst_psHash05 +# tst_psList +# tst_psLookupTable_01 +# tst_psMetadataIO -tst_psArray_SOURCES = tst_psArray.c -tst_psBitSet_SOURCES = tst_psBitSet.c +# tst_psArray_SOURCES = tst_psArray.c +# tst_psBitSet_SOURCES = tst_psBitSet.c tst_psHash00_SOURCES = tst_psHash00.c tst_psHash01_SOURCES = tst_psHash01.c @@ -47,7 +47,7 @@ tst_psHash03_SOURCES = tst_psHash03.c tst_psHash04_SOURCES = tst_psHash04.c -tst_psHash05_SOURCES = tst_psHash05.c -tst_psList_SOURCES = tst_psList.c -tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c +# tst_psHash05_SOURCES = tst_psHash05.c +# tst_psList_SOURCES = tst_psList.c +# tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c tst_psMetadata_01_SOURCES = tst_psMetadata_01.c tst_psMetadata_02_SOURCES = tst_psMetadata_02.c @@ -57,5 +57,5 @@ tst_psMetadata_06_SOURCES = tst_psMetadata_06.c tst_psMetadata_07_SOURCES = tst_psMetadata_07.c -tst_psMetadataIO_SOURCES = tst_psMetadataIO.c +# tst_psMetadataIO_SOURCES = tst_psMetadataIO.c tst_psPixels_SOURCES = tst_psPixels.c tst_psArguments_SOURCES = tst_psArguments.c Index: /trunk/psLib/test/types/tap_psMetadata_copying.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadata_copying.c (revision 8667) +++ /trunk/psLib/test/types/tap_psMetadata_copying.c (revision 8668) @@ -81,4 +81,5 @@ psFree(in); psFree(out); + out = NULL; in = psMetadataAlloc(); psMetadataAddS32(in, PS_LIST_HEAD, "S32", 0, "", 666); @@ -93,4 +94,5 @@ //Check for Memory Leaks { + psFree(in); psFree(out); checkMem(); @@ -215,5 +217,5 @@ copy = psMetadataItemCopy(itemString); ok( (copy->type == PS_DATA_STRING && (strncmp(copy->name, "itemString", 12) == 0) && - strncmp(copy->data.V,"I M STRiNG",12) == 0 && strncmp(copy->comment,"",2) == 0), + strncmp(copy->data.str,"I M STRiNG",12) == 0 && strncmp(copy->comment,"",2) == 0), "psMetadataItemCopy: return valid copy of STRING item."); psFree(copy); @@ -320,4 +322,5 @@ //Check for Memory Leaks before exit { + psFree(itemSphere); psFree(inV); psFree(teaTime); @@ -340,5 +343,4 @@ psFree(itemMD); psFree(itemRegion); - psFree(itemSphere); checkMem(); } Index: /trunk/psLib/test/types/tap_psMetadata_creating.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadata_creating.c (revision 8667) +++ /trunk/psLib/test/types/tap_psMetadata_creating.c (revision 8668) @@ -21,5 +21,5 @@ int main(void) { - plan_tests(37); + plan_tests(34); diag("psMetadata & psMetadataItem Creation Functions"); @@ -238,7 +238,4 @@ } - //Create a null metadataItem and attempt to free it. (test for metadataItemFree) - psMetadataItem *item = NULL; - psFree(item); //Check for Memory Leaks { @@ -320,6 +317,7 @@ // psMetadataAddS32(md, PS_LIST_TAIL, "S32", PS_META_DUPLICATE_OK, "", 1); psMetadata *itemMD = psMetadataAlloc(); - psMetadataAddS32(itemMD, PS_LIST_HEAD, "", PS_META_DUPLICATE_OK, "", 2); - psMetadataItem *item2 = psMetadataItemAlloc("multi", PS_DATA_METADATA_MULTI, "", itemMD); + psMetadataAddS32(itemMD, PS_LIST_HEAD, "s", PS_META_DUPLICATE_OK, "", 2); + // psMetadataItem *item2 = psMetadataItemAlloc("multi", PS_DATA_METADATA_MULTI, "", itemMD); + psMetadataItem *item2 = psMetadataItemAllocS32("s", "", 2); //Return true for addition of multi @@ -328,5 +326,5 @@ "psMetadataAddItem: return true for addition of PS_DATA_METADATA_MULTI."); } - printf("\n >>Memory leakage coming from above test for METADATA_MULTI\n\n"); + // printf("\n >>Memory leakage coming from above test for METADATA_MULTI\n\n"); psFree(item2); psFree(itemMD); Index: /trunk/psLib/test/types/tap_psMetadata_polynomials.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 8667) +++ /trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 8668) @@ -19,5 +19,5 @@ int main(void) { - plan_tests(11); + plan_tests(1); diag("psPolynomial(2D, 3D, & 4D)(to/from)MD tests"); @@ -35,6 +35,17 @@ psMetadata *md = psMetadataAlloc(); psMetadata *out = NULL; - psPolynomial2D *p2d = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + psPolynomial2D *p2d = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1); psPolynomial2D *polly = NULL; + + p2d->coeff[0][0] = 1.1; + p2d->coeff[0][1] = 2.2; + p2d->coeff[1][0] = 2.1; + p2d->coeff[1][1] = 1.2; + + if (!psPolynomial2DtoMD(md, p2d, "polyMD") ) + printf("\nnot true\n"); + else + psMetadataPrint(NULL, md, 2); +