Changeset 11686 for trunk/psLib/src/sys/psAbort.h

Timestamp:

Feb 7, 2007, 1:52:54 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API:

add noreturn attribute
remove unneeded 'name' params
turn into a macro so file/line/func are automatiically passed

File:

• trunk/psLib/src/sys/psAbort.h (modified) (3 diffs)

trunk/psLib/src/sys/psAbort.h

@@ -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 +20 @@
 /// @addtogroup SysUtils System Utilities
 /// @{
+
+#include <stdarg.h>
 
 /** Reports an abort message to logging facility
@@ -30 +33 @@
  *
  */
-#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
 
 /// @}