Changeset 7837

Timestamp:

Jul 6, 2006, 5:42:31 PM (20 years ago)

Author:

Paul Price

Message:

Adding cleanup.
Arguments metadata exists on pmConfig after having called pmConfigRead.

File:

• trunk/ppFringe/src/ppFringeSetup.c (modified) (3 diffs)

trunk/ppFringe/src/ppFringeSetup.c

@@ -23 +23 @@
     )
 {
+    // Setup and parse command-line arguments
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-template", 0, "Template output", NULL);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-detid", 0, "Detrend identifier", NULL);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-classid", 0, "Class identifier", NULL);
+
     if (*config->argc == 1) {
         // No command-line arguments: print the help
         usageAndDie(config);
     }
-
-    // Setup and parse command-line arguments
-    psMetadata *arguments = psMetadataAlloc();
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-template", 0, "Template output", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-detid", 0, "Detrend identifier", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-classid", 0, "Class identifier", NULL);
     if (!psArgumentParse(config->arguments, config->argc, config->argv) || *config->argc < 2) {
         printf("Unable to parse command-line arguments.\n\n");
@@ -41 +40 @@
     data->inName = config->argv[1];
     data->outName = config->argv[2];
-    data->templateName = psMetadataLookupStr(NULL, arguments, "-template");
+    data->templateName = psMetadataLookupStr(NULL, config->arguments, "-template");
 
     // Open the input file, determine the camera
@@ -118 +117 @@
     psFree(config);
     psFree(data);
+    pmConceptsDone();
+    pmConfigDone();
     psLibFinalize();
     exit(EXIT_FAILURE);