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

Clean up C-style casts from pointers to void

Browse Source 
Change-Id: I302d313f2d14d908672d4534aad1818e820eaae4
This commit is contained in:
Stephan Bergmann
2015-03-28 19:04:53 +01:00
parent 88d7938ade
commit ba868c28a3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ OString getPluginJarPath(
JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info) JavaInfo* createJavaInfo(const rtl::Reference<VendorBase> & info)
{ {
JavaInfo* pInfo = (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo)); JavaInfo* pInfo = static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
if (pInfo == NULL) if (pInfo == NULL)
return NULL; return NULL;
OUString sVendor = info->getVendor(); OUString sVendor = info->getVendor();
@@ -351,7 +351,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
} }
//Now vecVerifiedInfos contains all those JREs which meet the version requirements //Now vecVerifiedInfos contains all those JREs which meet the version requirements
//Transfer them into the array that is passed out. //Transfer them into the array that is passed out.
arInfo = (JavaInfo**) rtl_allocateMemory(vecVerifiedInfos.size() * sizeof (JavaInfo*)); arInfo = static_cast<JavaInfo**>(rtl_allocateMemory(vecVerifiedInfos.size() * sizeof (JavaInfo*)));
int j = 0; int j = 0;
typedef vector<rtl::Reference<VendorBase> >::const_iterator cit; typedef vector<rtl::Reference<VendorBase> >::const_iterator cit;
for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ++ii, ++j) for (cit ii = vecVerifiedInfos.begin(); ii != vecVerifiedInfos.end(); ++ii, ++j)

10
jvmfwk/source/elements.cxx
View File

@@ -979,7 +979,7 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const
{ {
if (bNil == true || m_bEmptyNode == true) if (bNil == true || m_bEmptyNode == true)
return NULL; return NULL;
JavaInfo * pInfo = (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo)); JavaInfo * pInfo = static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
if (pInfo == NULL) if (pInfo == NULL)
return NULL; return NULL;
memset(pInfo, 0, sizeof(JavaInfo)); memset(pInfo, 0, sizeof(JavaInfo));
@@ -1075,8 +1075,8 @@ void MergedSettings::getVmParametersArray(
osl::MutexGuard guard(FwkMutex::get()); osl::MutexGuard guard(FwkMutex::get());
OSL_ASSERT(parParams != NULL && size != NULL); OSL_ASSERT(parParams != NULL && size != NULL);
*parParams = (rtl_uString **) *parParams = static_cast<rtl_uString **>(
rtl_allocateMemory(sizeof(rtl_uString*) * m_vmParams.size()); rtl_allocateMemory(sizeof(rtl_uString*) * m_vmParams.size()));
if (*parParams == NULL) if (*parParams == NULL)
return; return;
@@ -1097,8 +1097,8 @@ void MergedSettings::getJRELocations(
osl::MutexGuard guard(FwkMutex::get()); osl::MutexGuard guard(FwkMutex::get());
assert(parLocations != NULL && size != NULL); assert(parLocations != NULL && size != NULL);
*parLocations = (rtl_uString **) *parLocations = static_cast<rtl_uString **>(
rtl_allocateMemory(sizeof(rtl_uString*) * m_JRELocations.size()); rtl_allocateMemory(sizeof(rtl_uString*) * m_JRELocations.size()));
if (*parLocations == NULL) if (*parLocations == NULL)
return; return;

6
jvmfwk/source/framework.cxx
View File

@@ -171,8 +171,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
} }
//create an fill the array of JavaInfo* //create an fill the array of JavaInfo*
sal_Int32 nSize = vecInfo.size() + vecInfoManual2.size(); sal_Int32 nSize = vecInfo.size() + vecInfoManual2.size();
*pparInfo = (JavaInfo**) rtl_allocateMemory( *pparInfo = static_cast<JavaInfo**>(rtl_allocateMemory(
nSize * sizeof(JavaInfo*)); nSize * sizeof(JavaInfo*)));
if (*pparInfo == NULL) if (*pparInfo == NULL)
return JFW_E_ERROR; return JFW_E_ERROR;
@@ -1111,7 +1111,7 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
if (pInfo == NULL) if (pInfo == NULL)
return NULL; return NULL;
JavaInfo* newInfo = JavaInfo* newInfo =
(JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo)); static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
if (newInfo) if (newInfo)
{ {
memcpy(newInfo, pInfo, sizeof(JavaInfo)); memcpy(newInfo, pInfo, sizeof(JavaInfo));