Changeset 7818 for trunk/ppMerge/src/ppMergeConfig.c

Timestamp:

Jul 5, 2006, 12:57:39 PM (20 years ago)

Author:

Paul Price

Message:

API change to pmConfigRead.

File:

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

trunk/ppMerge/src/ppMergeConfig.c

@@ -21 +21 @@
 pmConfig *ppMergeConfig(int argc, char **argv)
 {
-    pmConfig *config = pmConfigRead(argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv);
     // Load the site-wide configuration information
     if (! config) {
@@ -36 +36 @@
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-onoff", 0, "Number of on/off pairs", 0);
 
-    if (config->argc == 1) {
-        usage(config->argv[0], config);
+    if (argc == 1) {
+        usage(argv[0], config);
     }
 
     // Parse the arguments
-    if (! psArgumentParse(config->arguments, &config->argc, config->argv) || config->argc < 3) {
-        usage(config->argv[0], config);
+    if (! psArgumentParse(config->arguments, &argc, argv) || argc < 3) {
+        usage(argv[0], config);
     }
 
     // Add the output image to the arguments list
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
-                     config->argv[1]);
+                     argv[1]);
 
     // Everything remaining must be input files
-    if (config->argc - 2 <= 1) {
+    if (argc - 2 <= 1) {
         psError(PS_ERR_IO, true, "No files to combine.\n");
         exit(EXIT_FAILURE);
     }
-    psArray *files = psArrayAlloc(config->argc - 2);
-    for (int i = 2; i < config->argc; i++) {
-        files->data[i - 2] = psStringCopy(config->argv[i]);
+    psArray *files = psArrayAlloc(argc - 2);
+    for (int i = 2; i < argc; i++) {
+        files->data[i - 2] = psStringCopy(argv[i]);
     }
-    files->n = config->argc - 2;
+    files->n = argc - 2;
     psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "INPUT", PS_DATA_ARRAY,
                      "Array of inputs images", files);