strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.17.28); FILE MERGED

Browse source 
2006/04/07 19:55:52 sb 1.17.28.6: RESYNC: (1.18-1.19); FILE MERGED
2006/02/27 11:43:03 sb 1.17.28.5: #i53898# Made code waring-free.
2005/11/09 18:39:17 pl 1.17.28.4: #i53898# removed warnings
2005/10/27 15:08:47 pl 1.17.28.3: #i55991# removed warnings for solaris platform
2005/09/22 20:20:21 sb 1.17.28.2: RESYNC: (1.17-1.18); FILE MERGED
2005/09/01 14:56:18 sb 1.17.28.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 23:09:15 +00:00
parent fe63c51267
commit 3d30cffb6d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: sunjavaplugin.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: rt $ $Date: 2006-03-09 10:55:24 $
* last change: $Author: hr $ $Date: 2006-06-20 00:09:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -124,7 +124,6 @@ OString getPluginJarPath(
OUString sName(sLocation + OUSTR("/lib/") + sName1);
OUString sPath1;
OUString sPath2;
bool bOk = false;
if (osl_getSystemPathFromFileURL(sName.pData, & sPath1.pData)
== osl_File_E_None)
{
@ -292,9 +291,9 @@ javaPluginError jfw_plugin_getAllJavaInfos(
if (arExcludeList > 0)
{
bool bExclude = false;
for (int i = 0; i < nLenList; i++)
for (int j = 0; j < nLenList; j++)
{
rtl::OUString sExVer(arExcludeList[i]);
rtl::OUString sExVer(arExcludeList[j]);
try
{
if (cur->compareVersions(sExVer) == 0)
@ -462,7 +461,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
JNIEnv ** ppEnv)
{
osl::MutexGuard guard(getPluginMutex());
javaPluginError errcode = JFW_PLUGIN_E_NONE;
// unless errcode is volatile the following warning occurs on gcc:
// warning: variable 'errcode' might be clobbered by `longjmp' or `vfork'
volatile javaPluginError errcode = JFW_PLUGIN_E_NONE;
if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL)
return JFW_PLUGIN_E_INVALID_ARG;
//Check if the Vendor (pInfo->sVendor) is supported by this plugin
@ -507,7 +508,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
rtl::OUString sSymbolCreateJava(
RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getSymbol(
JNI_CreateVM_Type * pCreateJavaVM = (JNI_CreateVM_Type *) osl_getFunctionSymbol(
moduleRt, sSymbolCreateJava.pData);
if (!pCreateJavaVM)
{
@ -549,8 +550,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// all some directories of the Java installation. This is necessary for
// all versions below 1.5.1
options[0].optionString= (char *) "abort";
options[0].extraInfo= (void* )abort_handler;
int index = 1;
options[0].extraInfo= (void* )(sal_IntPtr)abort_handler;
rtl::OString sClassPathProp("-Djava.class.path=");
rtl::OString sClassPathOption;
for (int i = 0; i < cOptions; i++)
@ -596,7 +596,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
*/
g_bInGetJavaVM = 1;
jint err;
JavaVM * pJavaVM;
JavaVM * pJavaVM = 0;
memset( jmp_jvm_abort, 0, sizeof(jmp_jvm_abort));
int jmpval= setjmp( jmp_jvm_abort );
/* If jmpval is not "0" then this point was reached by a longjmp in the