Changeset 11687 for trunk/psModules/src/config

Timestamp:

Feb 7, 2007, 1:58:17 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (3 diffs)
• pmConfigCamera.c (modified) (4 diffs)
• pmConfigRecipes.c (modified) (8 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-30 00:05:16 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:58:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1006 +1006 @@
         FILE *f = fopen (config->argv[Narg], "r");
         if (f == NULL) {
-            psAbort ("psphot", "unable to open specified list file");
+            psAbort("unable to open specified list file");
         }
         while (fgets (line, 1024, f) != NULL) {
@@ -1020 +1020 @@
             default:
                 // rigid format, no comments allowed?
-                psAbort ("pmConfig", "error parsing input list file");
+                psAbort("error parsing input list file");
                 break;
             }

trunk/psModules/src/config/pmConfigCamera.c

@@ -118 +118 @@
         break;
     default:
-        psAbort(PS_FILE_LINE, "Should never get here.\n");
+        psAbort("Should never get here.\n");
     }
 
@@ -144 +144 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -199 +199 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -252 +252 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 

trunk/psModules/src/config/pmConfigRecipes.c

@@ -126 +126 @@
     if (optionsItem) {
         if (optionsItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "OPTIONS is not of type METADATA.");
+            psAbort("OPTIONS is not of type METADATA.");
         }
         options = psMemIncrRefCounter(optionsItem->data.V);
@@ -220 +220 @@
     if (recipesItem) {
         if (recipesItem->type != PS_DATA_METADATA) {
-            psAbort(__func__, "RECIPES is not of type METADATA.");
+            psAbort("RECIPES is not of type METADATA.");
         }
         recipes = psMemIncrRefCounter(recipesItem->data.V);
@@ -256 +256 @@
                 psFree(recipe);                 // Drop reference
             } else {
-                psAbort ("pmConfig.c", "error reading config file %s\n", recipeSource);
+                psAbort("error reading config file %s\n", recipeSource);
             }
         } else {
@@ -284 +284 @@
     assert(config);
     if ((sourceType != PM_RECIPE_SOURCE_SITE) && (sourceType != PM_RECIPE_SOURCE_CAMERA)) {
-        psAbort ("pmConfig", "invalid source for loadRecipes");
+        psAbort("invalid source for loadRecipes");
     }
     if (!source) {
@@ -308 +308 @@
         // type mismatch is a serious error
         if (fileItem->type != PS_DATA_STRING) {
-            psAbort ("pmConfig", "%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
+            psAbort("%s in %s RECIPES is not of type STR", fileItem->name, sourceName);
         }
 
@@ -323 +323 @@
         if (currentItem) {
             if (currentItem->type != PS_DATA_METADATA) {
-                psAbort(__func__, "Item from recipes is not of type METADATA.");
+                psAbort("Item from recipes is not of type METADATA.");
             }
             current = psMemIncrRefCounter(currentItem->data.V);
@@ -364 +364 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments RECIPES is not of type METADATA", item->name);
+            psAbort("%s in config arguments RECIPES is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data
@@ -470 +470 @@
         // type mismatch is a serious error
         if (item->type != PS_DATA_METADATA) {
-            psAbort ("pmConfig", "%s in config arguments OPTIONS is not of type METADATA", item->name);
+            psAbort("%s in config arguments OPTIONS is not of type METADATA", item->name);
         }
         // increment the ref counter to protect the data