diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:10:42 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:48 +0100 |
commit | adc6fe00e3ef3cca5bbd49a4633181856bf111df (patch) | |
tree | ea50caa8979aa23d77f912bee478d968ccf18232 /sal | |
parent | 629b05ac304a47f70180d044ac5db18a9ecfc9cc (diff) |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'sal')
-rw-r--r-- | sal/cpprt/operators_new_delete.cxx | 2 | ||||
-rw-r--r-- | sal/osl/os2/file.cxx | 2 | ||||
-rw-r--r-- | sal/osl/os2/file_url.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_url.cxx | 8 | ||||
-rw-r--r-- | sal/osl/w32/file_dirvol.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index f48ce1269236..103e8f0d5914 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -93,7 +93,7 @@ struct AllocatorTraits p = static_cast<char*>(p) - sizeof(signature_type); if (memcmp (p, m_signature, sizeof(signature_type)) != 0) { - OSL_ENSURE(0, "operator delete mismatch"); + OSL_FAIL("operator delete mismatch"); } #endif /* OSL_DEBUG_LEVEL */ return p; diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx index 2e2640378973..4a67b10fea23 100644 --- a/sal/osl/os2/file.cxx +++ b/sal/osl/os2/file.cxx @@ -481,7 +481,7 @@ oslFileError SAL_CALL osl_closeDirectory( oslDirectory Directory ) err = osl_File_E_None; break; default: - OSL_ENSURE( 0, "Invalid directory type" ); + OSL_FAIL( "Invalid directory type" ); break; } diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx index 966f31cecab0..426ee84b7f1f 100644 --- a/sal/osl/os2/file_url.cxx +++ b/sal/osl/os2/file_url.cxx @@ -783,7 +783,7 @@ oslFileError osl_getSystemPathFromFileURL_Ex( message = szBuffer; } - OSL_ENSURE( 0, message ); + OSL_FAIL( message ); } #endif // OSL_DEBUG_LEVEL > 0 diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 7d6913a8d1a5..ab6c9d664811 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -138,7 +138,7 @@ static sal_Bool findWrongUsage( const sal_Unicode *path, sal_Int32 len ) oslFileError SAL_CALL osl_getCanonicalName( rtl_uString* ustrFileURL, rtl_uString** pustrValidURL ) { - OSL_ENSURE(0, "osl_getCanonicalName not implemented"); + OSL_FAIL("osl_getCanonicalName not implemented"); rtl_uString_newFromString(pustrValidURL, ustrFileURL); return osl_File_E_None; @@ -160,7 +160,7 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrFileURL, rt /* if( (sal_Unicode) '/' == ustrFileURL->buffer[0] ) { - OSL_ENSURE( 0, "osl_getSystemPathFromFileURL: input is already system path" ); + OSL_FAIL( "osl_getSystemPathFromFileURL: input is already system path" ); rtl_uString_assign( pustrSystemPath, ustrFileURL ); return osl_File_E_None; } @@ -317,14 +317,14 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, /* if( 0 == rtl_ustr_ascii_shortenedCompare_WithLength( ustrSystemPath->buffer, ustrSystemPath->length,"file://", 7 ) ) { - OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is already file URL" ); + OSL_FAIL( "osl_getFileURLFromSystemPath: input is already file URL" ); rtl_uString_assign( pustrFileURL, ustrSystemPath ); } else { rtl_uString *pTmp2 = NULL; - OSL_ENSURE( 0, "osl_getFileURLFromSystemPath: input is wrong file URL" ); + OSL_FAIL( "osl_getFileURLFromSystemPath: input is wrong file URL" ); rtl_uString_newFromStr_WithLength( pustrFileURL, ustrSystemPath->buffer + 5, ustrSystemPath->length - 5 ); rtl_uString_newFromAscii( &pTmp2, "file://" ); rtl_uString_newConcat( pustrFileURL, *pustrFileURL, pTmp2 ); diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 95e68e6e1817..88cefe7d7eca 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -1030,7 +1030,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory Directory) } break; default: - OSL_ENSURE( 0, "Invalid directory type" ); + OSL_FAIL( "Invalid directory type" ); break; } |