Changes in src/Common/Assert.cc [57f408e:b3c36f4]

File:

• src/Common/Assert.cc (modified) (2 diffs)

src/Common/Assert.cc

@@ -21 +21 @@
 extern const char * __progname;                                                 // global name of running executable (argv[0])
 
-#define CFA_ASSERT_FMT "*CFA assertion error* from program \"%s\" in \"%s\" at line %d in file \"%s\""
+#define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
 // called by macro assert in assert.h
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
-        fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
         abort();
 }
@@ -31 +31 @@
 // called by macro assertf
 void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) {
-        fprintf( stderr, CFA_ASSERT_FMT ": ", __progname, function, line, file );
+        fprintf( stderr, CFA_ASSERT_FMT ": ", assertion, __progname, function, line, file );
         va_list args;
         va_start( args, fmt );