Index: trunk/psModules/src/config/pmConfig.c
===================================================================
--- trunk/psModules/src/config/pmConfig.c	(revision 11676)
+++ trunk/psModules/src/config/pmConfig.c	(revision 11687)
@@ -4,6 +4,6 @@
  *  @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,5 +1006,5 @@
         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,5 +1020,5 @@
             default:
                 // rigid format, no comments allowed?
-                psAbort ("pmConfig", "error parsing input list file");
+                psAbort("error parsing input list file");
                 break;
             }
Index: trunk/psModules/src/config/pmConfigCamera.c
===================================================================
--- trunk/psModules/src/config/pmConfigCamera.c	(revision 11676)
+++ trunk/psModules/src/config/pmConfigCamera.c	(revision 11687)
@@ -118,5 +118,5 @@
         break;
     default:
-        psAbort(PS_FILE_LINE, "Should never get here.\n");
+        psAbort("Should never get here.\n");
     }
 
@@ -144,5 +144,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -199,5 +199,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
@@ -252,5 +252,5 @@
             break;
         default:
-            psAbort(PS_FILE_LINE, "Should never get here.\n");
+            psAbort("Should never get here.\n");
         }
 
Index: trunk/psModules/src/config/pmConfigRecipes.c
===================================================================
--- trunk/psModules/src/config/pmConfigRecipes.c	(revision 11676)
+++ trunk/psModules/src/config/pmConfigRecipes.c	(revision 11687)
@@ -126,5 +126,5 @@
     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,5 +220,5 @@
     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,5 +256,5 @@
                 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,5 +284,5 @@
     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,5 +308,5 @@
         // 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,5 +323,5 @@
         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,5 +364,5 @@
         // 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,5 +470,5 @@
         // 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