Index: trunk/psLib/src/sys/psAbort.c
===================================================================
--- trunk/psLib/src/sys/psAbort.c	(revision 11675)
+++ trunk/psLib/src/sys/psAbort.c	(revision 11686)
@@ -9,7 +9,8 @@
  *
  *  @author Eric Van Alst, MHPCC
+ *  @author Joshua Hoblitt, University of Hawaii
  *   
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,9 +23,14 @@
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include "psAbort.h"
 #include "psError.h"
 #include "psLogMsg.h"
 
-void psAbort(const char *name, const char *format, ...)
+void p_psAbort(const char *file,
+               unsigned int lineno,
+               const char *func,
+               const char *format,
+               ...)
 {
     psErrorStackPrint(stderr, "Aborting. Error stack:");
@@ -35,5 +41,5 @@
 
     // Call logging function with PS_LOG_ABORT level
-    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
+    psLogMsgV("psLib.sys", PS_LOG_ABORT, format, argPtr);
 
     // Clean up stack after variable arguement has been used
Index: trunk/psLib/src/sys/psAbort.h
===================================================================
--- trunk/psLib/src/sys/psAbort.h	(revision 11675)
+++ trunk/psLib/src/sys/psAbort.h	(revision 11686)
@@ -8,7 +8,8 @@
  *
  *  @author Eric Van Alst, MHPCC
+ *  @author Joshua Hoblitt, University of Hawaii
  *
- *  $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  $Date: 2007-01-23 22:47:23 $
+ *  $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  $Date: 2007-02-07 23:52:54 $
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -19,4 +20,6 @@
 /// @addtogroup SysUtils System Utilities
 /// @{
+
+#include <stdarg.h>
 
 /** Reports an abort message to logging facility
@@ -30,17 +33,26 @@
  *
  */
-#ifdef __GNUC__
+#ifdef DOXYGEN
 void psAbort(
-    const char *name,                  ///< Source of abort such as file or function detected
-    const char *format,                   ///< A printf style formatting statement defining msg
-    ...
-) __attribute__((format(printf, 2, 3)));
-#else // __GNUC__
-void psAbort(
-    const char *name,                  ///< Source of abort such as file or function detected
-    const char *format,                   ///< A printf style formatting statement defining msg
+    const char *format,                 ///< A printf style formatting statement
     ...
 );
-#endif // __GNUC__
+#else // ifdef DOXYGEN
+void p_psAbort(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const char *format,                 ///< A printf style formatting statement
+    ...
+#ifdef __GNUC__
+) __attribute__((format(printf, 4, 5), noreturn));
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+#ifndef SWIG
+#define psAbort(...) \
+      p_psAbort(__FILE__, __LINE__, __func__, __VA_ARGS__)
+#endif // iddef SWIG
+#endif // ifdef DOXYGEN
 
 /// @}
Index: trunk/psLib/src/sys/psError.c
===================================================================
--- trunk/psLib/src/sys/psError.c	(revision 11675)
+++ trunk/psLib/src/sys/psError.c	(revision 11686)
@@ -11,6 +11,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 01:15:49 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -65,5 +65,5 @@
         psArrayAdd(errorStack, 0, err);
     } else {
-        psAbort(__func__, "attempt to exceed maximum error stack depth of %ld",
+        psAbort("attempt to exceed maximum error stack depth of %ld",
                 (long)MAX_ERROR_STACK_SIZE);
     }
@@ -78,5 +78,5 @@
         // thread exits
         if (pthread_key_create(&errorStack_key, psFreeWrapper)) {
-            psAbort(__func__, "pthread_key_create() failed");
+            psAbort("pthread_key_create failed()");
         }
         errorStackKeyInitialized = true;
@@ -95,5 +95,5 @@
         // param
         if (pthread_setspecific(errorStack_key, errorStack)) {
-            psAbort(__func__, "pthread_setspecific() failed");
+            psAbort("pthread_setspecific() failed");
         }
     }
Index: trunk/psLib/src/sys/psString.c
===================================================================
--- trunk/psLib/src/sys/psString.c	(revision 11675)
+++ trunk/psLib/src/sys/psString.c	(revision 11686)
@@ -13,6 +13,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 06:01:42 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -339,5 +339,5 @@
     }
 
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return 0;
 }