Changeset 15292

Timestamp:

Oct 11, 2007, 3:44:00 PM (19 years ago)

Author:

Paul Price

Message:

Trying to get usage display to behave.

File:

• trunk/ppMerge/src/ppMergeConfig.c (modified) (4 diffs)

trunk/ppMerge/src/ppMergeConfig.c

@@ -14 +14 @@
 // Output usage information
 static void usage(const char *programName, // Name of the program
-                  pmConfig *config      // Configuration (contains the arguments list)
+                  psMetadata *arguments // Arguments list
     )
 {
@@ -21 +21 @@
            "\t%s OUTPUT.fits INPUT1.fits INPUT2.fits ...\n"
            "\n", programName);
-    psArgumentHelp(config->arguments);
+    psArgumentHelp(arguments);
+    psFree(arguments);
     exit(EXIT_FAILURE);
 }
@@ -34 +35 @@
     }
 
-    // Command-line arguments
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-type", 0, "Type of calibration frame", "");
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-zero", 0, "Subtract background?", false);
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-scale", 0, "Scale by background?", false);
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "-exptime", 0, "Scale by the exposure time?", false);
-    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-onoff", 0, "Number of on/off pairs", 0);
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-stats", 0, "MDC file to hold statistics ", NULL);
+    psMetadata *arguments = psMetadataAlloc(); // Command-line arguments
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-type", 0, "Type of calibration frame", "");
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-zero", 0, "Subtract background?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-scale", 0, "Scale by background?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-exptime", 0, "Scale by the exposure time?", false);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-onoff", 0, "Number of on/off pairs", 0);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "MDC file to hold statistics ", NULL);
 
     if (argc == 1) {
-        usage(argv[0], config);
+        psFree(config);
+        usage(argv[0], arguments);
     }
 
     // Parse the arguments
-    if (! psArgumentParse(config->arguments, &argc, argv) || argc < 3) {
-        usage(argv[0], config);
+    if (!psArgumentParse(arguments, &argc, argv) || argc < 3) {
+        psFree(config);
+        usage(argv[0], arguments);
     }
 
@@ -54 +57 @@
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
                      argv[1]);
+
+    psMetadataCopy(config->arguments, arguments);
 
     // Everything remaining must be input files