Changeset c13e8dc8 for src/libcfa/assert.c

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/libcfa/assert.c (modified) (3 diffs)

src/libcfa/assert.c

@@ -17 +17 @@
 #include <stdarg.h>                                                             // varargs
 #include <stdio.h>                                                              // fprintf
-#include "libhdr/libdebug.h"
+#include "bits/debug.h"
 
 extern "C" {
@@ -26 +26 @@
         // called by macro assert in assert.h
         void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-                __lib_debug_print_safe( CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+                __cfaabi_dbg_bits_print_safe( CFA_ASSERT_FMT ".\n", __progname, function, line, file );
                 abort();
         }
@@ -32 +32 @@
         // called by macro assertf
         void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-                __lib_debug_acquire();
-                __lib_debug_print_nolock( CFA_ASSERT_FMT ": ", __progname, function, line, file );
+                __cfaabi_dbg_bits_acquire();
+                __cfaabi_dbg_bits_print_nolock( CFA_ASSERT_FMT ": ", __progname, function, line, file );
 
                 va_list args;
                 va_start( args, fmt );
-                __lib_debug_print_vararg( fmt, args );
+                __cfaabi_dbg_bits_print_vararg( fmt, args );
                 va_end( args );
 
-                __lib_debug_print_nolock( "\n" );
-                __lib_debug_release();
+                __cfaabi_dbg_bits_print_nolock( "\n" );
+                __cfaabi_dbg_bits_release();
                 abort();
         }