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 /jvmfwk | |
parent | Remove unnecessary brackets (diff) | |
download | core-adc6fe00e3ef3cca5bbd49a4633181856bf111df.tar.gz core-adc6fe00e3ef3cca5bbd49a4633181856bf111df.zip |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 30 | ||||
-rw-r--r-- | jvmfwk/source/fwkbase.cxx | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 9025266571fd..75f0f973ac16 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -267,7 +267,7 @@ bool VendorBase::needsRestart() const int VendorBase::compareVersions(const rtl::OUString& /*sSecond*/) const { - OSL_ENSURE(0, "[Java framework] VendorBase::compareVersions must be " + OSL_FAIL("[Java framework] VendorBase::compareVersions must be " "overridden in derived class."); return 0; } diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 59f1942f13af..cd74131b24b2 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -240,7 +240,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi { retVal = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return retVal; } @@ -418,7 +418,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -627,7 +627,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -716,7 +716,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -844,7 +844,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath( { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -878,7 +878,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -911,7 +911,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -933,7 +933,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -958,7 +958,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters( { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -983,7 +983,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters( { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -1006,7 +1006,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCp) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -1029,7 +1029,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; } @@ -1053,7 +1053,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -1079,7 +1079,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; @@ -1104,7 +1104,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations( { errcode = e.errorCode; fprintf(stderr, "%s\n", e.message.getStr()); - OSL_ENSURE(0, e.message.getStr()); + OSL_FAIL(e.message.getStr()); } return errcode; diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index e6856747f348..75400c8b8538 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -125,7 +125,7 @@ VendorSettings::VendorSettings(): { OString sMsg("[Java framework] A vendor settings file was not specified." "Check the bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS "."); - OSL_ENSURE(0, sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); throw FrameworkException(JFW_E_CONFIGURATION, sMsg); } if (sSettingsPath.getLength() > 0) |