Index: trunk/psLib/src/sys/psError.h
===================================================================
--- trunk/psLib/src/sys/psError.h	(revision 11674)
+++ trunk/psLib/src/sys/psError.h	(revision 11694)
@@ -10,7 +10,8 @@
  *  @author RHL, Princeton
  *  @author Eric Van Alst, MHPCC
- *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 01:15:49 $
+ *  @author Joshua Hoblitt, University of Hawaii
+ *
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 01:59:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,4 +56,5 @@
 );
 
+
 /** Get last error put on the error stack
  *
@@ -64,4 +66,5 @@
 psErr* psErrorLast(void);
 
+
 /** Get errorCode of last error put on the error stack
  *
@@ -70,4 +73,5 @@
 psErrorCode psErrorCodeLast(void);
 
+
 /** Clears the error stack.
  *
@@ -77,4 +81,5 @@
 void psErrorClear(void);
 
+
 /** Get the error stack depth
  *
@@ -82,4 +87,5 @@
  */
 long psErrorGetStackSize();
+
 
 /** Prints error stack to specified open file descriptor
@@ -91,17 +97,13 @@
  *
  */
-#ifdef __GNUC__
 void psErrorStackPrint(
     FILE* fd,                          ///< destination file descriptor
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in format
+#ifdef __GNUC__
 ) __attribute__((format(printf, 2, 3)));
-#else // __GNUC__
-void psErrorStackPrint(
-    FILE* fd,                          ///< destination file descriptor
-    const char* format,                ///< printf-style format of header line
-    ...                                ///< any parameters required in format
-);
-#endif // __GNUC__
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
 
 
@@ -120,7 +122,7 @@
     va_list va                         ///< any parameters required in format
 );
-#endif // #ifndef SWIG
-
-#ifdef DOXYGEN
+#endif // ifndef SWIG
+
+
 /** Reports an error message to the logging facility
  *
@@ -133,4 +135,5 @@
  *  @return psErrorCode    the given error code
  */
+#ifdef DOXYGEN
 psErrorCode psError(
     psErrorCode code,                  ///< Error class code
@@ -139,29 +142,5 @@
     ...                                ///< any parameters required in format
 );
-
-/** Logs a warning message.
- *
- *  This procedure logs a message to the destination set by a prior
- *  call to psLogSetDestination(), This is equivalent to calling
- *  psLogMsg with a level of PS_LOG_WARN.
- *
- */
-void psWarning(
-    const char* format,                ///< printf-style format of header line
-    ...                                ///< any parameters required in format
-);
-#else // #ifdef DOXYGEN
-
-/** 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 format to generate a proper
- *  log message.  This function is used to check a specific code location.
- *
- *  This function modifies the error stack.
- *
- *  @return psErrorcode    the given error code
- */
-#ifdef __GNUC__
+#else // ifdef DOXYGEN
 psErrorCode p_psError(
     const char* filename,              ///< file name
@@ -172,25 +151,29 @@
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in format
+#ifdef __GNUC__
 ) __attribute__((format(printf, 6, 7)));
-#else // __GNUC__
-psErrorCode p_psError(
-    const char* filename,              ///< file name
-    unsigned int lineno,               ///< line number in file
-    const char* func,                  ///< function name
-    psErrorCode code,                  ///< Error class code
-    bool new,                          ///< true if error originates at this location
-    const char* format,                ///< printf-style format of header line
-    ...                                ///< any parameters required in format
-);
-#endif // __GNUC__
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+#ifndef SWIG
+#define psError(code,new,...) \
+      p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
+
 
 /** Logs a warning message.
  *
- *  This procedure logs a message to the destination set by a prior call to
- *  psLogSetDestination().  This is equivalent to calling psLogMsg with a level of
- *  PS_LOG_WARN.  This function is used to check a specific code location.
- *
-*/
-#ifdef __GNUC__
+ *  This procedure logs a message to the destination set by a prior
+ *  call to psLogSetDestination(), This is equivalent to calling
+ *  psLogMsg with a level of PS_LOG_WARN.
+ *
+ */
+#ifdef DOXYGEN
+void psWarning(
+    const char* format,                ///< printf-style format of header line
+    ...                                ///< any parameters required in format
+);
+#else // #ifdef DOXYGEN
 void p_psWarning(
     const char* file,                  ///< file name
@@ -199,22 +182,15 @@
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in format
+#ifdef __GNUC__
 ) __attribute__((format(printf, 4, 5)));
-#else // __GNUC__
-void p_psWarning(
-    const char* file,                  ///< file name
-    int lineno,                        ///< line number in file
-    const char* func,                  ///< function name
-    const char* format,                ///< printf-style format of header line
-    ...                                ///< any parameters required in format
-);
-#endif // __GNUC__
-
-
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
 #ifndef SWIG
-#define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
-#define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
-#endif // #ifndef SWIG
-
-#endif // ! DOXYGEN
+#define psWarning(...) \
+      p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
+
 
 /** Create a new psErr struct