Changeset 10441

Timestamp:

Dec 4, 2006, 11:55:52 AM (19 years ago)

Author:

eugene

Message:

updated to new pmConfigRead

Location:

trunk

Files:

• ppMerge/src/ppMergeConfig.c (modified) (1 diff)
• ppMerge/src/ppMergeOptions.c (modified) (1 diff)
• ppNorm/src/ppNormCalc.c (modified) (1 diff)
• ppStats/src/ppStatsStandAlone.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeConfig.c

@@ -25 +25 @@
 pmConfig *ppMergeConfig(int argc, char **argv)
 {
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, PPMERGE_RECIPE);
     // Load the site-wide configuration information
     if (! config) {

trunk/ppMerge/src/ppMergeOptions.c

@@ -118 +118 @@
     }
 
-    // Get the recipes
-    if (!config->recipes && !pmConfigReadRecipes(config)) {
-        psError(PS_ERR_IO, false, "Unable to read recipes.\n");
-        exit(EXIT_FAILURE);
-    }
+    // we must have the recipes by this point
+    assert (config->recipes);
 
     // Now we can read the recipe

trunk/ppNorm/src/ppNormCalc.c

@@ -23 +23 @@
 {
     psLibInit(NULL);
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, NULL);
     psFree(config);
 

trunk/ppStats/src/ppStatsStandAlone.c

@@ -21 +21 @@
 
     // Parse the configuration and arguments
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(&argc, argv, PPSTATS_RECIPE);
 
     // Get the options, open the files