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 | 7f656740d865bcdf77a49a41d47aedf401a80795 (patch) | |
| tree | 146474539a8caa50fb1be8028a2cedce91b9f2fd | |
| parent | adc6fe00e3ef3cca5bbd49a4633181856bf111df (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 d2130292b4b1..cc23cd1b2a8f 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 c52026000218..cfe015ceee41 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 3d7779f18ffb..66f88c089adc 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 42f57a5e839f..bc9048d72a36 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 */ |