Changeset 11667

Timestamp:

Feb 6, 2007, 10:47:15 AM (19 years ago)

Author:

gusciora

Message:

Fixed memory leaks

File:

• trunk/psLib/test/types/tap_psMetadataConfigFormat.c (modified) (10 diffs)

trunk/psLib/test/types/tap_psMetadataConfigFormat.c

@@ -18 +18 @@
 int main(void)
 {
-    plan_tests(13);
+    plan_tests(19);
 
     psMetadata *md = NULL;
@@ -27 +27 @@
     //Return NULL for NULL metadata input
     {
+        psMemId id = psMemGetId();
         out = psMetadataConfigFormat(md);
         ok( out == NULL,
             "psMetadataConfigFormat:         return NULL for NULL metadata input.");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
     //Return NULL for empty metadata input
     {
@@ -38 +42 @@
             "psMetadataConfigFormat:         return NULL for empty metadata input.");
     }
+
+
     //Return NULL for metadata with missing hash table
     {
@@ -50 +56 @@
         md->hash = temp;
     }
+
+
     //Return NULL for metadata containing a psList
     {
@@ -60 +68 @@
         psFree(md);
     }
+
+
     //Return NULL for attempting to format vector with type = complex
     {
+        psMemId id = psMemGetId();
         psVector *vec = psVectorAlloc(60, PS_TYPE_C64);
         for (int i = 0; i < 5; i++)
@@ -74 +85 @@
             "Complex vector.");
         psFree(vec);
+        psFree(md);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
     //Return NULL for attempting to format psTime with type = -1
     {
-        psFree(md);
+        psMemId id = psMemGetId();
         md = psMetadataAlloc();
         psTime *time = psTimeAlloc(PS_TIME_TT);
@@ -87 +102 @@
             "invalid time type.");
         psFree(time);
+        psFree(md);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
     //Return valid metadata for attempting to format NULL psTime metadataItem
     {
-        psFree(md);
+        psMemId id = psMemGetId();
         md = psMetadataAlloc();
         psTime *time = psTimeAlloc(PS_TIME_TT);
@@ -108 +127 @@
         psFree(out);
         out = NULL;
+        psFree(md);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
     //Return valid metadata for attempting to format NULL psTime metadataItem
     {
-        psFree(md);
+        psMemId id = psMemGetId();
         md = psMetadataAlloc();
         psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, NULL, 666);
@@ -125 +148 @@
         psFree(out);
         out = NULL;
+        psFree(md);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
     //Return valid metadata for attempting to format NULL psTime metadataItem
     {
-        psFree(md);
+        psMemId id = psMemGetId();
         md = psMetadataAlloc();
         psMetadataAddS32(md, PS_LIST_HEAD, "f32", 0, "f32_1", 666);
@@ -147 +174 @@
         psFree(out);
         out = NULL;
+        psFree(md);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }