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

Timestamp:

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

Author:

Paul Price

Message:

API change to pmConfigRead.

File:

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

trunk/ppImage/src/ppImageArguments.c

@@ -14 +14 @@
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv);
     if (config == NULL) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -30 +30 @@
 
     // recipe option: -usemask : override MASK setting in phase2.recipe
-    if ((N = psArgumentGet(config->argc, config->argv, "-usemask"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet(argc, argv, "-usemask"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddBool (options, PS_LIST_TAIL, "MASK", PS_META_REPLACE, "", true);
-        psArgumentRemove (N, &config->argc, config->argv);
+        psArgumentRemove (N, &argc, argv);
     }
 
@@ -54 +54 @@
 
     // chip selection is used to limit chips to be processed
-    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
-        psArgumentRemove (N, &config->argc, config->argv);
+    if ((N = psArgumentGet (argc, argv, "-chip"))) {
+        psArgumentRemove (N, &argc, argv);
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "",
-                          config->argv[N]);
-        psArgumentRemove (N, &config->argc, config->argv);
+                          argv[N]);
+        psArgumentRemove (N, &argc, argv);
     }
 
-    if (config->argc != 2) usage ();
+    if (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",
-                     config->argv[1]);
+                     argv[1]);
 
     return config;