Changeset 12993

Timestamp:

Apr 24, 2007, 11:51:19 AM (19 years ago)

Author:

Paul Price

Message:

Fixing argument parsing following change to pmConfig

Location:

trunk/ppStats/src

Files:

• ppStatsSetupFromArgs.c (modified) (5 diffs)
• ppStatsSetupFromArgs.h (modified) (1 diff)
• ppStatsStandAlone.c (modified) (2 diffs)

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -15 +15 @@
 
 // Print usage information and die
-static void usageAndDie(pmConfig *config      // Configuration (contains the arguments list)
+static void usageAndDie(char *argv[],   // Command-line arguments: only need the first which is always present
+                        pmConfig *config // Configuration
     )
 {
@@ -21 +22 @@
            "Usage:\n"
            "\t%s INPUT.fits [OUTPUT_NAME]\n"
-           "\n", config->argv[0]);
+           "\n", argv[0]);
     psArgumentHelp(config->arguments);
     psFree(config);
@@ -86 +87 @@
 
 
-ppStatsData *ppStatsSetupFromArgs(pmConfig *config // Configuration
+ppStatsData *ppStatsSetupFromArgs(int *argc, char *argv[], // Command-line arguments
+                                  pmConfig *config // Configuration
     )
 {
@@ -111 +113 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-level", 0, "File level", 0);
 
-    if (*config->argc == 1) {
+    if (*argc == 1) {
         // No command-line arguments: print the help
-        usageAndDie(config);
-    }
-    if (!psArgumentParse(arguments, config->argc, config->argv) ||
-        (*config->argc != 2 && *config->argc != 3)) {
+        usageAndDie(argv, config);
+    }
+    if (!psArgumentParse(arguments, argc, argv) ||
+        (*argc != 2 && *argc != 3)) {
         printf("Unable to parse command-line arguments.\n\n");
-        usageAndDie(config);
+        usageAndDie(argv, config);
     }
 
     // Parse the command-line options
     ppStatsData *data = ppStatsDataAlloc(); // The data
-    const char *inName = config->argv[1]; // Input file name
-    psArgumentRemove(1, config->argc, config->argv);
+    const char *inName = argv[1]; // Input file name
+    psArgumentRemove(1, argc, argv);
 
     listFromArguments(arguments, "Chip", "-chip", data->chips);
@@ -194 +196 @@
     // Common path for error conditions: clean up and exit.
 die:
-    psErrorStackPrint (stderr, "failure in %s", __func__);
+    psErrorStackPrint(stderr, "Unable to set ppStats parameters from command-line arguments");
     psFree(config);
     psFree(data);

trunk/ppStats/src/ppStatsSetupFromArgs.h

@@ -6 +6 @@
 
 // Set up the options and input/output files
-ppStatsData *ppStatsSetupFromArgs(pmConfig *config // Configuration
+ppStatsData *ppStatsSetupFromArgs(int *argc, char *argv[], // Command-line arguments
+                                  pmConfig *config // Configuration
     );
 

trunk/ppStats/src/ppStatsStandAlone.c

@@ -28 +28 @@
 
     // Get the options, open the files
-    ppStatsData *data = ppStatsSetupFromArgs(config);
+    ppStatsData *data = ppStatsSetupFromArgs(&argc, argv, config);
     if (!data) {
         psError(PS_ERR_UNKNOWN, false, "Unable to parse command-line arguments.\n");
@@ -37 +37 @@
     const char *outName = NULL;         // Output file name
     FILE *outFile = stdout;             // Output file
-    if (*config->argc == 2) {
-        outName = config->argv[1];
+    if (argc == 2) {
+        outName = argv[1];
         if (outName && strlen(outName) > 0) {
             outFile = fopen(outName, "w");