mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: declaration of 'errcode' shadows a global declaration

Browse Source
This commit is contained in:
David Tardon
2012-04-17 07:11:13 +02:00
parent 8edf5c5ee6
commit ec4f5494da
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View File

@@ -347,7 +347,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
sal_Int32 nLenList, sal_Int32 nLenList,
JavaInfo ** ppInfo) JavaInfo ** ppInfo)
{ {
javaPluginError errcode = JFW_PLUGIN_E_NONE; javaPluginError errorcode = JFW_PLUGIN_E_NONE;
OSL_ASSERT(path); OSL_ASSERT(path);
OSL_ASSERT(sVendor); OSL_ASSERT(sVendor);
@@ -444,7 +444,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
} }
*ppInfo = createJavaInfo(aVendorInfo); *ppInfo = createJavaInfo(aVendorInfo);
return errcode; return errorcode;
} }
#if defined(WNT) #if defined(WNT)
@@ -571,9 +571,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// unless guard is volatile the following warning occurs on gcc: // unless guard is volatile the following warning occurs on gcc:
// warning: variable 't' might be clobbered by `longjmp' or `vfork' // warning: variable 't' might be clobbered by `longjmp' or `vfork'
volatile osl::MutexGuard guard(PluginMutex::get()); volatile osl::MutexGuard guard(PluginMutex::get());
// unless errcode is volatile the following warning occurs on gcc: // unless errorcode is volatile the following warning occurs on gcc:
// warning: variable 'errcode' might be clobbered by `longjmp' or `vfork' // warning: variable 'errorcode' might be clobbered by `longjmp' or `vfork'
volatile javaPluginError errcode = JFW_PLUGIN_E_NONE; volatile javaPluginError errorcode = JFW_PLUGIN_E_NONE;
if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL) if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL)
return JFW_PLUGIN_E_INVALID_ARG; return JFW_PLUGIN_E_INVALID_ARG;
//Check if the Vendor (pInfo->sVendor) is supported by this plugin //Check if the Vendor (pInfo->sVendor) is supported by this plugin
@@ -737,13 +737,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
{ {
fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
"Can not create Java Virtual Machine\n"); "Can not create Java Virtual Machine\n");
errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; errorcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
} }
else if( err > 0) else if( err > 0)
{ {
fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
"Can not create JavaVirtualMachine, abort handler was called.\n"); "Can not create JavaVirtualMachine, abort handler was called.\n");
errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; errorcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
} }
} }
else else
@@ -760,7 +760,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
fprintf(stderr, "lo_get_javavm returns %p", *ppVm); fprintf(stderr, "lo_get_javavm returns %p", *ppVm);
#endif #endif
return errcode; return errorcode;
} }
extern "C" extern "C"