Changeset 3b56166 for libcfa/src/assert.cfa

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/assert.cfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:10:26 2017
-// Update Count     : 2
+// Last Modified On : Tue Feb  4 13:00:18 2020
+// Update Count     : 6
 //
 
@@ -17 +17 @@
 #include <stdarg.h>                                                             // varargs
 #include <stdio.h>                                                              // fprintf
+#include <unistd.h>                                                             // STDERR_FILENO
 #include "bits/debug.hfa"
 
@@ -25 +26 @@
 
         // called by macro assert in assert.h
-        void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-                __cfaabi_dbg_bits_print_safe( CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
+        void __assert_fail( const char assertion[], const char file[], unsigned int line, const char function[] ) {
+                __cfaabi_bits_print_safe( STDERR_FILENO, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
                 abort();
         }
 
         // called by macro assertf
-        void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-                __cfaabi_dbg_bits_acquire();
-                __cfaabi_dbg_bits_print_nolock( CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
+        void __assert_fail_f( const char assertion[], const char file[], unsigned int line, const char function[], const char fmt[], ... ) {
+                __cfaabi_bits_acquire();
+                __cfaabi_bits_print_nolock( STDERR_FILENO, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
 
                 va_list args;
                 va_start( args, fmt );
-                __cfaabi_dbg_bits_print_vararg( fmt, args );
+                __cfaabi_bits_print_vararg( STDERR_FILENO, fmt, args );
                 va_end( args );
 
-                __cfaabi_dbg_bits_print_nolock( "\n" );
-                __cfaabi_dbg_bits_release();
+                __cfaabi_bits_print_nolock( STDERR_FILENO, "\n" );
+                __cfaabi_bits_release();
                 abort();
         }