Changeset 7677 for trunk/ppImage/src/ppImageArguments.c

Timestamp:

Jun 23, 2006, 5:33:37 PM (20 years ago)

Author:

Paul Price

Message:

Fixing code after pushing argc,argv into pmConfig.

File:

• trunk/ppImage/src/ppImageArguments.c (modified) (3 diffs)

trunk/ppImage/src/ppImageArguments.c

@@ -6 +6 @@
 }
 
-pmConfig *ppImageArguments(int *argc, char **argv) {
+pmConfig *ppImageArguments(int argc, char **argv) {
 
     int N;
     bool status;
 
-    if (*argc == 1) usage ();
+    if (argc == 1) usage ();
 
     // load the site-wide configuration information
@@ -30 +30 @@
 
     // recipe option: -usemask : override MASK setting in phase2.recipe
-    if ((N = psArgumentGet (*argc, argv, "-usemask"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
-        psArgumentRemove (N, argc, argv);
+    if ((N = psArgumentGet(config->argc, config->argv, "-usemask"))) {
+        psArgumentRemove (N, &config->argc, config->argv);
+        psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
+        psArgumentRemove (N, &config->argc, config->argv);
     }
 
-    // XXX add other PPIMAGE recipe options here 
+    // XXX add other PPIMAGE recipe options here
 
     // drop the local view on the options (saved on config->arguments)
@@ -42 +42 @@
 
     // the input file is a required argument; if not found, we will exit
-    status = pmConfigFileSetsMD (config->arguments, argc, argv, "INPUT", "-file", "-list");
+    status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");
     if (!status) { usage ();}
 
     // if these command-line options are supplied, load the file name lists into config->arguments
     // override any configuration-specified source for these files
-    pmConfigFileSetsMD (config->arguments, argc, argv, "BIAS", "-bias", "-biaslist");
-    pmConfigFileSetsMD (config->arguments, argc, argv, "DARK", "-dark", "-darklist");
-    pmConfigFileSetsMD (config->arguments, argc, argv, "FLAT", "-flat", "-flatlist");
-    pmConfigFileSetsMD (config->arguments, argc, argv, "MASK", "-mask", "-masklist");
-    pmConfigFileSetsMD (config->arguments, argc, argv, "FRINGE", "-fringe", "-fringelist");
+    pmConfigFileSetsMD (config->arguments, config, "BIAS", "-bias", "-biaslist");
+    pmConfigFileSetsMD (config->arguments, config, "DARK", "-dark", "-darklist");
+    pmConfigFileSetsMD (config->arguments, config, "FLAT", "-flat", "-flatlist");
+    pmConfigFileSetsMD (config->arguments, config, "MASK", "-mask", "-masklist");
+    pmConfigFileSetsMD (config->arguments, config, "FRINGE", "-fringe", "-fringelist");
 
     // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (*argc, argv, "-chip"))) {
-        psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
-        psArgumentRemove (N, argc, argv);
+    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
+        psArgumentRemove (N, &config->argc, config->argv);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "",
+                          config->argv[N]);
+        psArgumentRemove (N, &config->argc, config->argv);
     }
 
-    if (*argc != 2) usage ();
+    if (config->argc != 2) usage ();
 
     // Add the input and output images (which remain on the command-line) to the arguments list
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image", argv[1]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
+                     config->argv[1]);
 
     return config;