Move OSL_ENSURE(false,...) to OSL_FAIL(...)

bridges/source/remote/urp/urp_reader.cxx

@@ -565,8 +565,7 @@ void OReaderThread::run()
                     TYPELIB_DANGER_RELEASE( pType );
                     if ( !ok )
                     {
-                        OSL_ENSURE(
-                            false,
+                        OSL_FAIL(
                             ("urp_bridge: error while unpacking current"
                              " context") );
                         disposeEnvironment();

cppu/source/typelib/typelib.cxx

@@ -1309,7 +1309,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
     sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength(
         pTypeName->buffer, pTypeName->length, ':');
     if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') {
-        OSL_ENSURE(false, "Bad interface method type name");
+        OSL_FAIL("Bad interface method type name");
         return;
     }
     rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
@@ -1322,7 +1322,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod(
         || !complete(
             reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false))
     {
-        OSL_ENSURE(false, "No interface corresponding to interface method");
+        OSL_FAIL("No interface corresponding to interface method");
         return;
     }
 
@@ -1402,7 +1402,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength(
         pTypeName->buffer, pTypeName->length, ':');
     if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') {
-        OSL_ENSURE(false, "Bad interface attribute type name");
+        OSL_FAIL("Bad interface attribute type name");
         return;
     }
     rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1);
@@ -1415,7 +1415,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
         || !complete(
             reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false))
     {
-        OSL_ENSURE(false, "No interface corresponding to interface attribute");
+        OSL_FAIL("No interface corresponding to interface attribute");
         return;
     }
 

cppuhelper/source/implbase.cxx

@@ -254,8 +254,8 @@ void WeakComponentImplHelperBase::release()
                 dispose();
             }
             catch (RuntimeException const& exc) { // don't break throw ()
-                OSL_ENSURE(
-                    false, OUStringToOString(
+                OSL_FAIL(
+                    OUStringToOString(
                         exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 static_cast<void>(exc);
             }
@@ -390,8 +390,8 @@ void WeakAggComponentImplHelperBase::release()
                 dispose();
             }
             catch (RuntimeException const& exc) { // don't break throw ()
-                OSL_ENSURE(
-                    false, OUStringToOString(
+                OSL_FAIL(
+                    OUStringToOString(
                         exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
                 static_cast<void>(exc);
             }

cppuhelper/source/propshlp.cxx

@@ -1016,7 +1016,7 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
         {
 #ifndef OS2 // YD disabled, too many troubles with debug builds!
             if (bSorted) {
-                OSL_ENSURE( false, "Property array is not sorted" );
+                OSL_FAIL( "Property array is not sorted" );
             }
 #endif
             // not sorted

cppuhelper/source/weak.cxx

@@ -226,8 +226,8 @@ void OWeakObject::disposeWeakConnectionPoint()
             p->dispose();
         }
         catch (RuntimeException const& exc) {
-            OSL_ENSURE(
-                false, OUStringToOString(
+            OSL_FAIL(
+                OUStringToOString(
                     exc.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             static_cast<void>(exc);
         }

jvmaccess/source/virtualmachine.cxx

@@ -100,7 +100,7 @@ JNIEnv * VirtualMachine::attachThread(bool * pAttached) const
     JNIEnv * pEnv;
     jint n = m_pVm->GetEnv(reinterpret_cast< void ** >(&pEnv), m_nVersion);
     if (n != JNI_OK && n != JNI_EDETACHED) {
-        OSL_ENSURE(false, "JNI: GetEnv failed");
+        OSL_FAIL("JNI: GetEnv failed");
     }
     if (pEnv == 0)
     {
@@ -119,7 +119,7 @@ void VirtualMachine::detachThread() const
 {
 #ifdef SOLAR_JAVA
     if (m_pVm->DetachCurrentThread() != JNI_OK) {
-        OSL_ENSURE(false, "JNI: DetachCurrentThread failed");
+        OSL_FAIL("JNI: DetachCurrentThread failed");
     }
 #endif
 }

jvmfwk/plugins/sunmajor/pluginlib/util.cxx

@@ -203,7 +203,7 @@ inline FileHandleGuard::~FileHandleGuard() SAL_THROW(())
     {
         if (osl_closeFile(m_rHandle) != osl_File_E_None)
         {
-            OSL_ENSURE(false, "unexpected situation");
+            OSL_FAIL("unexpected situation");
         }
     }
 }

remotebridges/source/factory/bridgefactory.cxx

@@ -230,7 +230,7 @@ namespace remotebridges_factory
         }
         catch (rtl::MalformedUriException &)
         {
-            OSL_ENSURE(false, "MalformedUriException");
+            OSL_FAIL("MalformedUriException");
         }
         ServiceHashMap::iterator ii = m_mapProtocolToService.find( sProtocolName );
         if( ii != m_mapProtocolToService.end() )

sal/qa/osl/socket/sockethelper.cxx

@@ -107,7 +107,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
 #else
     char hostname[255];
     if (gethostname(hostname, 255) != 0) {
-        OSL_ENSURE( false, "#Error: gethostname failed."  );
+        OSL_FAIL( "#Error: gethostname failed."  );
     }
 
     struct hostent *hptr;

stoc/source/javavm/javavm.cxx

@@ -643,7 +643,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager,
         }
         catch (css::uno::Exception &)
         {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+            OSL_FAIL("com.sun.star.uno.Exception caught");
         }
     }
     return false;
@@ -1421,7 +1421,7 @@ JavaVirtualMachine::~JavaVirtualMachine()
         }
         catch (css::uno::Exception &)
         {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+            OSL_FAIL("com.sun.star.uno.Exception caught");
         }
     if (m_xJavaConfiguration.is())
         // We should never get here, but just in case...
@@ -1431,7 +1431,7 @@ JavaVirtualMachine::~JavaVirtualMachine()
         }
         catch (css::uno::Exception &)
         {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
+            OSL_FAIL("com.sun.star.uno.Exception caught");
         }
 }
 
@@ -1658,12 +1658,11 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset)
     }
     catch (css::uno::RuntimeException &)
     {
-        OSL_ENSURE(false, "RuntimeException");
+        OSL_FAIL("RuntimeException");
     }
     catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &)
     {
-        OSL_ENSURE(false,
-                   "jvmaccess::VirtualMachine::AttachGuard::CreationException");
+        OSL_FAIL("jvmaccess::VirtualMachine::AttachGuard::CreationException");
     }
 }