AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some -Wcast-qual warnings

Browse Source 
This is happening in code I don't usually test (32-bit, non-ICU, etc.)

KeccakF-1600-opt32.c:481:22: error: cast from type 'const unsigned char*' to type 'UINT32* {aka unsigned int*}' casts away qualifiers [-Werror=cast-qual]
KeccakF-1600-opt32.c:217:62: note: in definition of macro 'extractLanes'

Change-Id: I42e7ef1a481840699a8dffff140209823301a07a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Thiago Macieira 2015-09-08 12:14:45 -03:00
parent 3d7586b760
commit af6467c532
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdparty/sha3/KeccakF-1600-opt32.c vendored
View File

@ -191,10 +191,10 @@ static UINT64 fromInterleaving(UINT64 x)
return x; return x;
} }
static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32* evenAndOdd) static void setInterleavedWordsInto8bytes(UINT8* dest, const UINT32* evenAndOdd)
{ {
#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN) #if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
((UINT64*)dest)[0] = fromInterleaving(*(UINT64*)evenAndOdd); ((UINT64*)dest)[0] = fromInterleaving(*(const UINT64*)evenAndOdd);
#else // (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) #else // (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
// This can be optimized // This can be optimized
UINT64 evenAndOddWord = (UINT64)evenAndOdd[0] ^ ((UINT64)evenAndOdd[1] << 32); UINT64 evenAndOddWord = (UINT64)evenAndOdd[0] ^ ((UINT64)evenAndOdd[1] << 32);
@ -214,7 +214,7 @@ static void setInterleavedWordsInto8bytes(UINT8* dest, UINT32* evenAndOdd)
{ \ { \
unsigned i; \ unsigned i; \
for(i=0; i<(laneCount); i++) \ for(i=0; i<(laneCount); i++) \
setInterleavedWordsInto8bytes(data+i*8, (UINT32*)state+i*2); \ setInterleavedWordsInto8bytes(data+i*8, (const UINT32*)state+i*2); \
} }
#endif // With or without interleaving tables #endif // With or without interleaving tables

4
src/corelib/codecs/qbig5codec.cpp
View File

@ -1794,7 +1794,7 @@ QByteArray QBig5Codec::convertFromUnicode(const QChar *uc, int len, ConverterSta
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;
@ -1916,7 +1916,7 @@ QByteArray QBig5hkscsCodec::convertFromUnicode(const QChar *uc, int len, Convert
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;

4
src/corelib/codecs/qeucjpcodec.cpp
View File

@ -92,7 +92,7 @@ QEucJpCodec::QEucJpCodec() : conv(QJpUnicodeConv::newConverter(QJpUnicodeConv::D
*/ */
QEucJpCodec::~QEucJpCodec() QEucJpCodec::~QEucJpCodec()
{ {
delete (QJpUnicodeConv*)conv; delete (const QJpUnicodeConv*)conv;
conv = 0; conv = 0;
} }
@ -139,7 +139,7 @@ QByteArray QEucJpCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;

4
src/corelib/codecs/qeuckrcodec.cpp
View File

@ -108,7 +108,7 @@ QByteArray QEucKrCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;
@ -3421,7 +3421,7 @@ QByteArray QCP949Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt
} }
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;

6
src/corelib/codecs/qgb18030codec.cpp
View File

@ -138,7 +138,7 @@ QByteArray QGb18030Codec::convertFromUnicode(const QChar *uc, int len, Converter
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;
@ -415,7 +415,7 @@ QByteArray QGbkCodec::convertFromUnicode(const QChar *uc, int len, ConverterStat
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;
@ -566,7 +566,7 @@ QByteArray QGb2312Codec::convertFromUnicode(const QChar *uc, int len, ConverterS
++invalid; ++invalid;
} }
} }
rstr.resize(cursor - (uchar*)rstr.constData()); rstr.resize(cursor - (const uchar*)rstr.constData());
if (state) { if (state) {
state->invalidChars += invalid; state->invalidChars += invalid;

2
src/corelib/codecs/qjiscodec.cpp
View File

@ -97,7 +97,7 @@ QJisCodec::QJisCodec() : conv(QJpUnicodeConv::newConverter(QJpUnicodeConv::Defau
*/ */
QJisCodec::~QJisCodec() QJisCodec::~QJisCodec()
{ {
delete (QJpUnicodeConv*)conv; delete (const QJpUnicodeConv*)conv;
conv = 0; conv = 0;
} }

2
src/corelib/codecs/qsjiscodec.cpp
View File

@ -73,7 +73,7 @@ QSjisCodec::QSjisCodec() : conv(QJpUnicodeConv::newConverter(QJpUnicodeConv::Def
*/ */
QSjisCodec::~QSjisCodec() QSjisCodec::~QSjisCodec()
{ {
delete (QJpUnicodeConv*)conv; delete (const QJpUnicodeConv*)conv;
conv = 0; conv = 0;
} }

2
src/corelib/io/qurlidna.cpp
View File

@ -1503,7 +1503,7 @@ static bool isMappedToNothing(uint uc)
static bool containsProhibitedOuptut(const QString *str, int from) static bool containsProhibitedOuptut(const QString *str, int from)
{ {
const ushort *in = reinterpret_cast<const ushort *>(str->begin() + from); const ushort *in = reinterpret_cast<const ushort *>(str->begin() + from);
const ushort *end = (ushort *)str->data() + str->size(); const ushort *end = (const ushort *)str->data() + str->size();
for ( ; in < end; ++in) { for ( ; in < end; ++in) {
uint uc = *in; uint uc = *in;
if (QChar(uc).isHighSurrogate() && in < end - 1) { if (QChar(uc).isHighSurrogate() && in < end - 1) {