From 6f58d7a12e4acaad59a00df345591ac5ce552cbe Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 15 Jan 2018 09:04:11 +0100 Subject: More loplugin:cstylecast: registry Change-Id: I2c9436f5f9ea5ef3051d22310dee48ec39fad850 --- registry/source/keyimpl.cxx | 18 +++++++++--------- registry/source/reflread.cxx | 19 +++++++++---------- registry/source/reflwrit.cxx | 2 +- registry/source/regimpl.cxx | 8 ++++---- 4 files changed, 23 insertions(+), 24 deletions(-) (limited to 'registry') diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index 371290ca9b6b..1a511a5e2a44 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -256,7 +256,7 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy sal_uInt8 type = *pBuffer; readUINT32(pBuffer+VALUE_TYPEOFFSET, size); - *pValueType = (RegValueType)type; + *pValueType = static_cast(type); // if (*pValueType == RegValueType::UNICODE) // { // *pValueSize = (size / 2) * sizeof(sal_Unicode); @@ -308,7 +308,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal sal_uInt32 size = vSize; - sal_uInt8 type = (sal_uInt8)vType; + sal_uInt8 type = static_cast(vType); pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE + size)); memcpy(pBuffer, &type, 1); @@ -380,7 +380,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32 const * size += len * 4; - sal_uInt8 type = (sal_uInt8)RegValueType::LONGLIST; + sal_uInt8 type = sal_uInt8(RegValueType::LONGLIST); pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE + size)); memcpy(pBuffer, &type, 1); @@ -443,7 +443,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu size += 4 + strlen(pValueList[i]) + 1; } - sal_uInt8 type = (sal_uInt8)RegValueType::STRINGLIST; + sal_uInt8 type = sal_uInt8(RegValueType::STRINGLIST); pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE + size)); memcpy(pBuffer, &type, 1); @@ -511,7 +511,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p size += 4 + ((rtl_ustr_getLength(pValueList[i]) +1) * 2); } - sal_uInt8 type = (sal_uInt8)RegValueType::UNICODELIST; + sal_uInt8 type = sal_uInt8(RegValueType::UNICODELIST); pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE + size)); memcpy(pBuffer, &type, 1); @@ -589,7 +589,7 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const } sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize); rtl_freeMemory(pBuffer); @@ -689,7 +689,7 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue } sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); if (valueType != RegValueType::LONGLIST) { @@ -803,7 +803,7 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal } sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); if (valueType != RegValueType::STRINGLIST) { @@ -909,7 +909,7 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode*** } sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); if (valueType != RegValueType::UNICODELIST) { diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 8ee681537307..c434d903d0d4 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -283,7 +283,7 @@ sal_uInt32 ConstantPool::parseIndex() offset += readUINT32(offset); - if ( ((CPInfoTag) readUINT16(m_pIndex[i] + CP_OFFSET_ENTRY_TAG)) == + if ( static_cast(readUINT16(m_pIndex[i] + CP_OFFSET_ENTRY_TAG)) == CP_TAG_CONST_STRING ) { numOfStrings++; @@ -308,7 +308,7 @@ CPInfoTag ConstantPool::readTag(sal_uInt16 index) const if (m_pIndex && (index > 0) && (index <= m_numOfEntries)) { - tag = (CPInfoTag) readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG); + tag = static_cast(readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG)); } return tag; @@ -623,7 +623,7 @@ RTFieldAccess FieldList::getFieldAccess(sal_uInt16 index) const if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { try { - aAccess = (RTFieldAccess) readUINT16(sizeof(sal_uInt16) + (index * m_FIELD_ENTRY_SIZE) + FIELD_OFFSET_ACCESS); + aAccess = static_cast(readUINT16(sizeof(sal_uInt16) + (index * m_FIELD_ENTRY_SIZE) + FIELD_OFFSET_ACCESS)); } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); } @@ -788,7 +788,7 @@ RTReferenceType ReferenceList::getReferenceType(sal_uInt16 index) const if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { try { - refType = (RTReferenceType) readUINT16(sizeof(sal_uInt16) + (index * m_REFERENCE_ENTRY_SIZE) + REFERENCE_OFFSET_TYPE); + refType = static_cast(readUINT16(sizeof(sal_uInt16) + (index * m_REFERENCE_ENTRY_SIZE) + REFERENCE_OFFSET_TYPE)); } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); } @@ -820,7 +820,7 @@ RTFieldAccess ReferenceList::getReferenceAccess(sal_uInt16 index) const if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { try { - aAccess = (RTFieldAccess) readUINT16(sizeof(sal_uInt16) + (index * m_REFERENCE_ENTRY_SIZE) + REFERENCE_OFFSET_ACCESS); + aAccess = static_cast(readUINT16(sizeof(sal_uInt16) + (index * m_REFERENCE_ENTRY_SIZE) + REFERENCE_OFFSET_ACCESS)); } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); } @@ -986,10 +986,10 @@ RTParamMode MethodList::getMethodParamMode(sal_uInt16 index, sal_uInt16 paramInd (index <= m_numOfEntries) && (paramIndex <= readUINT16(m_pIndex[index] + METHOD_OFFSET_PARAM_COUNT))) { - aMode = (RTParamMode) readUINT16( + aMode = static_cast(readUINT16( m_pIndex[index] + calcMethodParamIndex(paramIndex) + - PARAM_OFFSET_MODE); + PARAM_OFFSET_MODE)); } } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); @@ -1067,7 +1067,7 @@ RTMethodMode MethodList::getMethodMode(sal_uInt16 index) const if ((m_numOfEntries > 0) && (index <= m_numOfEntries)) { try { - aMode = (RTMethodMode) readUINT16(m_pIndex[index] + METHOD_OFFSET_MODE); + aMode = static_cast(readUINT16(m_pIndex[index] + METHOD_OFFSET_MODE)); } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); } @@ -1258,8 +1258,7 @@ RTTypeClass TYPEREG_CALLTYPE typereg_reader_getTypeClass(void * hEntry) TypeRegistryEntry* pEntry = static_cast(hEntry); if (pEntry != nullptr) { try { - return (RTTypeClass) - (pEntry->readUINT16(OFFSET_TYPE_CLASS) & ~RT_TYPE_PUBLISHED); + return static_cast(pEntry->readUINT16(OFFSET_TYPE_CLASS) & ~RT_TYPE_PUBLISHED); } catch (BlopObject::BoundsError &) { SAL_WARN("registry", "bad data"); } diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index 9996284cb4a6..53b6d9d0e175 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -830,7 +830,7 @@ void TypeWriter::createBlop() if (m_fields[i].m_constValueType != RT_TYPE_NONE) { - pInfo = new CPInfo((CPInfoTag)m_fields[i].m_constValueType, pInfo); + pInfo = new CPInfo(static_cast(m_fields[i].m_constValueType), pInfo); pInfo->m_value.aConst = m_fields[i].m_constValue; cpIndexValue = pInfo->m_index; } diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index db665844e502..0bb4b2126ffa 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -953,7 +953,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, RegError _ret = RegError::NO_ERROR; sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize); rtl_freeMemory(pBuffer); @@ -1041,7 +1041,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, (rwBytes == VALUE_HEADERSIZE)) { sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize); rtl_freeMemory(pBuffer); @@ -1189,7 +1189,7 @@ RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue, const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); - sal_uInt8 type = (sal_uInt8)RegValueType::BINARY; + sal_uInt8 type = sal_uInt8(RegValueType::BINARY); sal_uInt8* pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE + aBlopSize)); memcpy(pBuffer, &type, 1); @@ -1363,7 +1363,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ } sal_uInt8 type = *pBuffer; - valueType = (RegValueType)type; + valueType = static_cast(type); readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize); pBuffer = static_cast(rtl_allocateMemory(valueSize)); -- cgit