Index: trunk/psLib/src/sysUtils/psError.h
===================================================================
--- trunk/psLib/src/sysUtils/psError.h	(revision 2204)
+++ trunk/psLib/src/sysUtils/psError.h	(revision 2273)
@@ -12,6 +12,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104,25 +104,19 @@
  *  log message.
  *
+ *  This function modifies the error stack.
+ *
+ *  @return psErrorCode    the given error code
  */
-void psError(
-    const char *name,                  ///< Source of error such as file or function detected
-    const char *fmt,                   ///< A printf style formatting statement defining msg
+psErrorCode p_psError(
+    const char* file,
+    int lineno,
+    const char* func,
+    psErrorCode code,                  ///< Error class code
+    psBool new,                        ///< true if error originates at this location
+    const char* fmt,
     ...
 );
 
-/** Reports an error message to the logging facility
- *
- *  This function will invoke the psLogMsg function with a level of
- *  PS_LOG_ERROR and pass the parameters name and fmt to generate a proper
- *  log message.
- *
- */
-psErrorCode psErrorMsg(
-    const char *name,                  ///< Name of error in the form aaa.bbb.ccc
-    psErrorCode code,                  ///< Error class code
-    psBool new,                          ///< true if error originates at this location
-    const char* fmt,                   ///< printf style formatting statement defining error message
-    ...
-);
+#define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
 
 /** Create a new psErr struct