Changes in libcfa/src/interpose.cfa [851fd92:5ccee64]

File:

• libcfa/src/interpose.cfa (modified) (6 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 13 17:35:37 2020
-// Update Count     : 178
+// Last Modified On : Mon Feb 17 10:18:53 2020
+// Update Count     : 166
 //
 
 #include <stdarg.h>                                                                             // va_start, va_end
-#include <stdio.h>
 #include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
@@ -144 +143 @@
 void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 void abort( bool signalAbort, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
-void __abort( bool signalAbort, const char fmt[], va_list args ) __attribute__(( __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
@@ -154 +152 @@
                 va_list argp;
                 va_start( argp, fmt );
-                __abort( false, fmt, argp );
+                abort( false, fmt, argp );
                 va_end( argp );
         }
@@ -220 +218 @@
 }
 
-// Cannot forward va_list.
-void __abort( bool signalAbort, const char fmt[], va_list args ) {
+void abort( bool signalAbort, const char fmt[], ... ) {
         void * kernel_data = kernel_abort();                            // must be done here to lock down kernel
         int len;
@@ -231 +228 @@
 
         assert( fmt );
+        va_list args;
+        va_start( args, fmt );
+
         len = vsnprintf( abort_text, abort_text_size, fmt, args );
+        va_end( args );
         __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
         if ( fmt[strlen( fmt ) - 1] != '\n' ) {                         // add optional newline if missing at the end of the format text
-                __cfaabi_bits_write( STDERR_FILENO, "\n", 1 );
+                __cfaabi_dbg_write( "\n", 1 );
         } // if
         kernel_abort_msg( kernel_data, abort_text, abort_text_size );
@@ -247 +248 @@
         va_list args;
         va_start( args, fmt );
-        __abort( false, fmt, args );
-    // CONTROL NEVER REACHES HERE!
+        abort( false, fmt, args );
         va_end( args );
-}
-
-void abort( bool signalAbort, const char fmt[], ... ) {
-    va_list args;
-    va_start( args, fmt );
-    __abort( signalAbort, fmt, args );
-    // CONTROL NEVER REACHES HERE!
-    va_end( args );
 }