Changes in src/libcfa/interpose.c [e464759:9d944b2]

File:

• src/libcfa/interpose.c (modified) (2 diffs)

src/libcfa/interpose.c

@@ -26 +26 @@
 
 #include "libhdr/libdebug.h"
-#include "libhdr/libtools.h"
 #include "startup.h"
+
+void abortf( const char *fmt, ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
 
 void interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
@@ -114 +115 @@
 static char abort_text[ abort_text_size ];
 
-extern "C" {
-        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                void * kernel_data = kernel_abort();
+void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+        void * kernel_data = kernel_abort();
+        
+        int len;
+        
+        if( fmt ) {
+                va_list args;
+                va_start( args, fmt );
 
-                int len;
+                len = vsnprintf( abort_text, abort_text_size, fmt, args );
 
-                if( fmt ) {
-                        va_list args;
-                        va_start( args, fmt );
+                va_end( args );
 
-                        len = vsnprintf( abort_text, abort_text_size, fmt, args );
+                __lib_debug_write( STDERR_FILENO, abort_text, len );
+                __lib_debug_write( STDERR_FILENO, "\n", 1 );
+        }
 
-                        va_end( args );
-
-                        __lib_debug_write( STDERR_FILENO, abort_text, len );
-                        __lib_debug_write( STDERR_FILENO, "\n", 1 );
-                }
-
-                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld)\n", (long int)getpid() ); // use UNIX pid (versus getPid)
-                __lib_debug_write( STDERR_FILENO, abort_text, len );
+        len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld)\n", (long int)getpid() ); // use UNIX pid (versus getPid)
+        __lib_debug_write( STDERR_FILENO, abort_text, len );
 
 
-                kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+        kernel_abort_msg( kernel_data, abort_text, abort_text_size );
 
-                libc_abort();
-        }
+        libc_abort();
 }