Changes in libcfa/src/interpose.cfa [d870df3: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 : Mon Mar  2 17:37:00 2020
-// Update Count     : 176
+// Last Modified On : Mon Feb 17 10:18:53 2020
+// Update Count     : 166
 //
 
@@ -143 +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" {
@@ -153 +152 @@
                 va_list argp;
                 va_start( argp, fmt );
-                __abort( false, fmt, argp );
+                abort( false, fmt, argp );
                 va_end( argp );
         }
@@ -219 +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;
@@ -230 +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 );
 
@@ -246 +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 );
 }