Index: trunk/psLib/test/types/tap_psMetadataConfig_input.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 9909)
+++ trunk/psLib/test/types/tap_psMetadataConfig_input.c	(revision 9910)
@@ -38,13 +38,9 @@
 {
     diag("  >>>Test 1:  psMetadataConfigRead");
-    psMetadata *md = NULL;
-    psMetadata *out = NULL;
-    unsigned int nfail = 0;
-    md = psMetadataAlloc();
-    psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, "", 666);
 
     //Return NULL for NULL filename input
     {
-        out = psMetadataConfigRead(out, &nfail, NULL, false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, NULL, false);
         ok( out == NULL,
             "psMetadataConfigRead:           return NULL for NULL filename input.");
@@ -52,5 +48,6 @@
     //Return NULL for invalid filename input
     {
-        out = psMetadataConfigRead(out, &nfail, ".", false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, ".", false);
         ok( out == NULL,
             "psMetadataConfigRead:           return NULL for invalid filename input.");
@@ -58,5 +55,6 @@
     //Return NULL for missing file input
     {
-        out = psMetadataConfigRead(out, &nfail, "table4.dat", false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, "table4.dat", false);
         ok( out == NULL,
             "psMetadataConfigRead:           return NULL for missing file input.");
@@ -64,14 +62,15 @@
     //Return empty metadata for read-only file with invalid syntax
     {
-        out = psMetadataConfigRead(out, &nfail, "table3.dat", false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, "table3.dat", false);
         ok( out != NULL && out->list->n == 0,
             "psMetadataConfigRead:           return empty metadata for file"
             " with invalid syntax.");
         psFree(out);
-        out = NULL;
     }
     //Return true for valid inputs - overwrite = false
     {
-        out = psMetadataConfigRead(out, &nfail, "metaconf.in", false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, "metaconf.in", false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && nfail == 25,
@@ -99,10 +98,10 @@
         skip_end();
         psMetadataConfigWrite(out, "mdc-overwrite_false.txt");
+        psFree(out);
     }
     //Return true for valid inputs - overwrite = true
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigRead(out, &nfail, "metaconf.in", true);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigRead(NULL, &nfail, "metaconf.in", true);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL  && nfail == 21,
@@ -130,12 +129,9 @@
         skip_end();
         psMetadataConfigWrite(out, "mdc-overwrite_true.txt");
+        psFree(out);
     }
 
     //Check for Memory leaks
-    {
-        psFree(out);
-        psFree(md);
-        checkMem();
-    }
+    checkMem();
 }
 
@@ -143,6 +139,4 @@
 {
     diag("  >>>Test 2:  psMetadataConfigParse");
-    psMetadata *out = NULL;
-    unsigned int nfail = 0;
     char str1[70];
     char str2[70];
@@ -166,5 +160,6 @@
     //Return NULL for NULL string input
     {
-        out = psMetadataConfigParse(out, &nfail, NULL, false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigParse(NULL, &nfail, NULL, false);
         ok( out == NULL,
             "psMetadataConfigParse:         return NULL for NULL string input.");
@@ -172,19 +167,14 @@
     //Return empty metadata for incorrect string input
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, NULL, str1, false);
+        psMetadata *out = psMetadataConfigParse(NULL, NULL, str1, false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem == NULL,
             "psMetadataConfigParse:         return empty metadata for invalid "
             "string input.");
-        if (tempItem != NULL)
-            printf("\n\n name=%s\n", tempItem->name);
+        psFree(out);
     }
     //Return correct metadata for correct string input - S32
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, NULL, str2, false);
+        psMetadata *out = psMetadataConfigParse(NULL, NULL, str2, false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem != NULL,
@@ -198,10 +188,9 @@
                 "psMetadataConfigParse:         return correct metadataItem name (S32)");
         skip_end();
+        psFree(out);
     }
     //Return correct metadata for correct string input - F64
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, NULL, str3, false);
+        psMetadata *out = psMetadataConfigParse(NULL, NULL, str3, false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem != NULL,
@@ -219,10 +208,10 @@
                 "psMetadataConfigParse:         return correct metadataItem name (F64)");
         skip_end();
+        psFree(out);
     }
     //Return correct metadata for string with duplicate entry - S8
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, &nfail, str4, false);
+        unsigned int nfail = 0;
+        psMetadata *out = psMetadataConfigParse(NULL, &nfail, str4, false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem != NULL && out->list->n == 1  && nfail == 1,
@@ -236,10 +225,9 @@
                 "psMetadataConfigParse:         return correct metadataItem name (S8)");
         skip_end();
+        psFree(out);
     }
     //Return correct metadata for correct string input - Vector
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, NULL, str7, true);
+        psMetadata *out = psMetadataConfigParse(NULL, NULL, str7, true);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem != NULL,
@@ -254,22 +242,17 @@
                 "psMetadataConfigParse:         return correct metadataItem name (Vector)");
         skip_end();
+        psFree(out);
     }
     //Return empty metadata for incorrect string input
     {
-        psFree(out);
-        out = NULL;
-        out = psMetadataConfigParse(out, NULL, str9, false);
+        psMetadata *out = psMetadataConfigParse(NULL, NULL, str9, false);
         psMetadataItem *tempItem = psMetadataGet(out, PS_LIST_HEAD);
         ok( out != NULL && tempItem == NULL,
             "psMetadataConfigParse:         return empty metadata for invalid "
             "string input.");
-        if (tempItem != NULL)
-            printf("\n\n name=%s\n", tempItem->name);
-    }
-    //Check for Memory leaks
-    {
-        psFree(out);
-        checkMem();
-    }
+        psFree(out);
+    }
+    // Check for Memory leaks
+    checkMem();
 
 }