diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:14:02 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:49 +0100 |
| commit | c2627e8a95ffc81498133cb3f26527c8395064b8 (patch) | |
| tree | 9043fcf4c6a0af5d7c474fd19960a90740002b72 | |
| parent | ff29e2d893da04490a159f9bc7111199f5e368ff (diff) | |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
| -rw-r--r-- | bridges/source/jni_uno/jni_base.h | 2 | ||||
| -rw-r--r-- | sal/osl/os2/socket.c | 2 | ||||
| -rw-r--r-- | sal/osl/unx/socket.c | 2 | ||||
| -rw-r--r-- | sal/osl/w32/file_error.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 92edbf678..2df9272e7 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -127,7 +127,7 @@ inline bool JNI_context::assert_no_exception() const if (JNI_FALSE != m_env->ExceptionCheck()) { m_env->ExceptionClear(); - OSL_ENSURE( 0, "unexpected java exception occurred!" ); + OSL_FAIL( "unexpected java exception occurred!" ); return false; } return true; diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c index b97dde7e3..fd00d18de 100644 --- a/sal/osl/os2/socket.c +++ b/sal/osl/os2/socket.c @@ -1605,7 +1605,7 @@ void SAL_CALL osl_releaseSocket( oslSocket pSocket ) #if defined(LINUX) if ( pSocket->m_bIsAccepting == sal_True ) { - OSL_ENSURE(0, "osl_destroySocket : attempt to destroy socket while accepting\n"); + OSL_FAIL("osl_destroySocket : attempt to destroy socket while accepting\n"); return; } #endif /* LINUX */ diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index 91cf06632..740959244 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -1656,7 +1656,7 @@ void SAL_CALL osl_releaseSocket( oslSocket pSocket ) #if defined(LINUX) if ( pSocket->m_bIsAccepting == sal_True ) { - OSL_ENSURE(0, "osl_destroySocket : attempt to destroy socket while accepting\n"); + OSL_FAIL("osl_destroySocket : attempt to destroy socket while accepting\n"); return; } #endif /* LINUX */ diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c index 3d33cdfda..45ad7ed18 100644 --- a/sal/osl/w32/file_error.c +++ b/sal/osl/w32/file_error.c @@ -148,7 +148,7 @@ void _osl_warnFile( const char *message, rtl_uString *ustrFile ) message = szBuffer; } - OSL_ENSURE( 0, message ); + OSL_FAIL( message ); } #endif /* OSL_DEBUG_LEVEL */ |