Skip to content

C
core
Kaydet (Commit) 0871b509 authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

Avoid explicit casts of (sizeof) constants known at compile time 

Partially revert my previous commit eb4cbea6
"Silence some conversion warnings", since no warning was really raised for
these obvious conversions.

Change-Id: Ie035655cdc56ceeb12a6141b168f7e9a8b863fee
üst 4fbda763
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
store/source/storbase.hxx
Dosyayı görüntüle @ 0871b509
...@@ -512,7 +512,7 @@ struct PageData ...@@ -512,7 +512,7 @@ struct PageData
void guard (sal_uInt32 nAddr) void guard (sal_uInt32 nAddr)
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
m_aDescr.m_nAddr = store::htonl(nAddr); m_aDescr.m_nAddr = store::htonl(nAddr);
nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G)));
m_aGuard.m_nCRC32 = store::htonl(nCRC32); m_aGuard.m_nCRC32 = store::htonl(nCRC32);
...@@ -523,7 +523,7 @@ struct PageData ...@@ -523,7 +523,7 @@ struct PageData
storeError verify (sal_uInt32 nAddr) const storeError verify (sal_uInt32 nAddr) const
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G)));
if (m_aGuard.m_nCRC32 != store::htonl(nCRC32)) if (m_aGuard.m_nCRC32 != store::htonl(nCRC32))
return store_E_InvalidChecksum; return store_E_InvalidChecksum;
......
store/source/storbios.cxx
Dosyayı görüntüle @ 0871b509
...@@ -120,7 +120,7 @@ struct OStoreSuperBlock ...@@ -120,7 +120,7 @@ struct OStoreSuperBlock
void guard() void guard()
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G)));
m_aGuard.m_nCRC32 = store::htonl(nCRC32); m_aGuard.m_nCRC32 = store::htonl(nCRC32);
} }
...@@ -134,7 +134,7 @@ struct OStoreSuperBlock ...@@ -134,7 +134,7 @@ struct OStoreSuperBlock
return store_E_WrongFormat; return store_E_WrongFormat;
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aDescr, static_cast<sal_uInt32>(theSize - sizeof(G)));
if (m_aGuard.m_nCRC32 != store::htonl(nCRC32)) if (m_aGuard.m_nCRC32 != store::htonl(nCRC32))
return store_E_InvalidChecksum; return store_E_InvalidChecksum;
......
store/source/stordata.hxx
Dosyayı görüntüle @ 0871b509
...@@ -320,7 +320,7 @@ struct OStorePageNameBlock ...@@ -320,7 +320,7 @@ struct OStorePageNameBlock
void guard() void guard()
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aKey, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aKey, static_cast<sal_uInt32>(theSize - sizeof(G)));
m_aGuard.m_nCRC32 = store::htonl(nCRC32); m_aGuard.m_nCRC32 = store::htonl(nCRC32);
} }
...@@ -330,7 +330,7 @@ struct OStorePageNameBlock ...@@ -330,7 +330,7 @@ struct OStorePageNameBlock
storeError verify() const storeError verify() const
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aKey, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aKey, static_cast<sal_uInt32>(theSize - sizeof(G)));
if (m_aGuard.m_nCRC32 != store::htonl(nCRC32)) if (m_aGuard.m_nCRC32 != store::htonl(nCRC32))
return store_E_InvalidChecksum; return store_E_InvalidChecksum;
...@@ -424,7 +424,7 @@ struct OStoreDirectoryDataBlock ...@@ -424,7 +424,7 @@ struct OStoreDirectoryDataBlock
void guard() void guard()
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aTable, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aTable, static_cast<sal_uInt32>(theSize - sizeof(G)));
m_aGuard.m_nCRC32 = store::htonl(nCRC32); m_aGuard.m_nCRC32 = store::htonl(nCRC32);
} }
...@@ -434,7 +434,7 @@ struct OStoreDirectoryDataBlock ...@@ -434,7 +434,7 @@ struct OStoreDirectoryDataBlock
storeError verify() const storeError verify() const
{ {
sal_uInt32 nCRC32 = 0; sal_uInt32 nCRC32 = 0;
nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, static_cast<sal_uInt32>(sizeof(sal_uInt32))); nCRC32 = rtl_crc32 (nCRC32, &m_aGuard.m_nMagic, sizeof(sal_uInt32));
nCRC32 = rtl_crc32 (nCRC32, &m_aTable, static_cast<sal_uInt32>(theSize - sizeof(G))); nCRC32 = rtl_crc32 (nCRC32, &m_aTable, static_cast<sal_uInt32>(theSize - sizeof(G)));
if (m_aGuard.m_nCRC32 != store::htonl(nCRC32)) if (m_aGuard.m_nCRC32 != store::htonl(nCRC32))
return store_E_InvalidChecksum; return store_E_InvalidChecksum;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment