diff options
| author | Lukas Larsson <[email protected]> | 2014-03-25 17:43:09 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-26 15:19:00 +0100 |
| commit | d2a5dc042c02dce5bc518eb576ea496af50e6373 (patch) | |
| tree | 11d57862ce966177ad612b122cd35a81f53d4419 | |
| parent | d28049c638f19de0f0f4c805d3efd004de417210 (diff) | |
| download | otp-d2a5dc042c02dce5bc518eb576ea496af50e6373.tar.gz otp-d2a5dc042c02dce5bc518eb576ea496af50e6373.tar.bz2 otp-d2a5dc042c02dce5bc518eb576ea496af50e6373.zip | |
ose: Fix erts assert failed printouts
| -rw-r--r-- | erts/emulator/sys/ose/sys.c | 4 | ||||
| -rw-r--r-- | erts/include/internal/ethr_mutex.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c index 414dfb2264..5b950a7dae 100644 --- a/erts/emulator/sys/ose/sys.c +++ b/erts/emulator/sys/ose/sys.c @@ -1741,10 +1741,10 @@ erl_assert_error(const char* expr, const char* func, { fflush(stdout); fprintf(stderr, "%s:%d:%s() Assertion failed: %s\n", - file, func, line, expr); + file, line, func, expr); fflush(stderr); ramlog_printf("%s:%d:%s() Assertion failed: %s\n", - file, func, line, expr); + file, line, func, expr); abort(); } diff --git a/erts/include/internal/ethr_mutex.h b/erts/include/internal/ethr_mutex.h index ee861065c5..6c931e0cd4 100644 --- a/erts/include/internal/ethr_mutex.h +++ b/erts/include/internal/ethr_mutex.h @@ -354,7 +354,7 @@ void ethr_rwmutex_rwunlock(ethr_rwmutex *); #ifdef ETHR_MTX_HARD_DEBUG #define ETHR_MTX_HARD_ASSERT(A) \ - ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, #A))) + ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__,#A))) #else #define ETHR_MTX_HARD_ASSERT(A) ((void) 1) #endif |