Changes in src/libcfa/interpose.c [169d944:3d5f2ef1]

File:

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

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  8 16:18:09 2018
-// Update Count     : 75
+// Last Modified On : Wed Feb  7 09:05:18 2018
+// Update Count     : 59
 //
 
@@ -28 +28 @@
 }
 
+#define __NO_ABORT_OVERLOAD // no abort overload avoid ambiguities
 #include "bits/debug.h"
 #include "bits/defs.h"
@@ -50 +51 @@
                         error = dlerror();
                         if ( error ) {
-                                abort( "interpose_symbol : failed to open libc, %s\n", error );
+                                abortf( "interpose_symbol : failed to open libc, %s\n", error );
                         }
                 #endif
@@ -68 +69 @@
 
         error = dlerror();
-        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
+        if ( error ) abortf( "interpose_symbol : internal error, %s\n", error );
 
         return originalFunc.fptr;
@@ -97 +98 @@
 
 struct {
-        void (* exit)( int ) __attribute__ (( __noreturn__ ));
-        void (* abort)( void ) __attribute__ (( __noreturn__ ));
+        __typeof__( exit  ) exit  __attribute__(( noreturn ));
+        __typeof__( abort ) abort __attribute__(( noreturn ));
 } __cabi_libc;
 
@@ -122 +123 @@
 
 // Forward declare abort after the __typeof__ call to avoid ambiguities
-void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
-void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
+void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
 
 extern "C" {
-        void abort( void ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
-                abort( NULL );
-        }
-
-        void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+        void abort( void ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+                abortf( NULL );
+        }
+
+        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
                 va_list argp;
                 va_start( argp, fmt );
@@ -137 +137 @@
         }
 
-        void exit( int status ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
-                __cabi_libc.exit( status );
-        }
-}
-
-void * kernel_abort    ( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return NULL; }
-void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) {}
-int kernel_abort_lastframe( void ) __attribute__ (( __nothrow__, __leaf__, __weak__ )) { return 4; }
+        void exit( int __status ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+                __cabi_libc.exit(__status);
+        }
+}
+
+void * kernel_abort    ( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; }
+void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ ((__nothrow__, __leaf__, __weak__)) {}
+int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return 4; }
 
 enum { abort_text_size = 1024 };
@@ -150 +150 @@
 static int abort_lastframe;
 
-void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
-    va_list args;
-    va_start( args, fmt );
-    vfprintf( stderr, fmt, args );
-    va_end( args );
-        __cabi_libc.exit( status );
-}
-
-void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
         void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
         int len;
@@ -234 +226 @@
 
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
-        abort( "Addressing invalid memory at location %p\n"
+        abortf( "Addressing invalid memory at location %p\n"
                         "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
                         sfp->si_addr );
@@ -240 +232 @@
 
 void sigHandler_ill( __CFA_SIGPARMS__ ) {
-        abort( "Executing illegal instruction at location %p.\n"
+        abortf( "Executing illegal instruction at location %p.\n"
                         "Possible cause is stack corruption.\n",
                         sfp->si_addr );
@@ -256 +248 @@
           default: msg = "unknown";
         } // choose
-        abort( "Computation error %s at location %p.\n", msg, sfp->si_addr );
+        abortf( "Computation error %s at location %p.\n", msg, sfp->si_addr );
 }