Changeset 6849 for trunk/ppImage/src/ppImageConfig.c

Timestamp:

Apr 12, 2006, 8:29:24 PM (20 years ago)

Author:

eugene

Message:

completed conversion to pmFPAfile paradigm

File:

• trunk/ppImage/src/ppImageConfig.c (modified) (2 diffs)

trunk/ppImage/src/ppImageConfig.c

@@ -6 +6 @@
 }
 
-pmConfig *ppImageConfig(int argc, char **argv)
+pmConfig *ppImageConfig(int *argc, char **argv)
 {
 
     bool status;
 
-    if (argc == 1) usage ();
+    if (*argc == 1) usage ();
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(argc, argv);
     if (! config) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -25 +25 @@
     // if these command-line options are supplied, load the file name lists into config->arguments
     // override any configuration-specified source for these files
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "BIAS", "-bias", "-biaslist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "DARK", "-dark", "-darklist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "FLAT", "-flat", "-flatlist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK", "-mask", "-masklist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "FRINGE", "-fringe", "-fringelist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "BIAS", "-bias", "-biaslist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "DARK", "-dark", "-darklist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "FLAT", "-flat", "-flatlist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "MASK", "-mask", "-masklist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "FRINGE", "-fringe", "-fringelist");
 
     // 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, argc, argv, "INPUT", "-file", "-list");
     if (!status) { usage ();}
 
-    if (! psArgumentParse(config->arguments, &argc, argv) || argc != 2) {
+    if (! psArgumentParse(config->arguments, argc, argv) || *argc != 2) {
         usage ();
     }