1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCborValue & QCborStreamReader tests: fix warning about %llx on 32-bit

Browse Source 
cborlargedatavalidation.cpp:93:60: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘qsizetype’ {aka ‘int’} [-Wformat=]
   93 |         QTest::addRow("bytearray-too-big-for-qbytearray-%llx", v)
      |                                                         ~~~^   ~
      |                                                            |   |
      |                                                            |   qsizetype {aka int}
      |                                                            long long unsigned int
      |                                                         %x

The cast to size_t is required to make the 64-bit not complain due to
the long vs long long difference.

Pick-to: 5.15 6.0
Change-Id: I00b01c01a66748508ea1fffd164a9add2a2650cf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Thiago Macieira 2020-11-24 17:08:11 -08:00
parent 3c88728b53
commit 017e41bb86
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/serialization/cborlargedatavalidation.cpp
View File

@ -90,23 +90,23 @@ void addValidationLargeData(qsizetype minInvalid, qsizetype maxInvalid)
bool overflows = v > std::numeric_limits<qsizetype>::max() - 1 - qsizetype(sizeof(v)); bool overflows = v > std::numeric_limits<qsizetype>::max() - 1 - qsizetype(sizeof(v));
CborError err = overflows ? CborErrorDataTooLarge : CborErrorUnexpectedEOF; CborError err = overflows ? CborErrorDataTooLarge : CborErrorUnexpectedEOF;
QTest::addRow("bytearray-too-big-for-qbytearray-%llx", v) QTest::addRow("bytearray-too-big-for-qbytearray-%zx", size_t(v))
<< QByteArray(toolong, sizeof(toolong)) << 0 << err; << QByteArray(toolong, sizeof(toolong)) << 0 << err;
QTest::addRow("bytearray-chunked-too-big-for-qbytearray-%llx", v) QTest::addRow("bytearray-chunked-too-big-for-qbytearray-%zx", size_t(v))
<< ('\x5f' + QByteArray(toolong, sizeof(toolong)) + '\xff') << ('\x5f' + QByteArray(toolong, sizeof(toolong)) + '\xff')
<< 0 << err; << 0 << err;
QTest::addRow("bytearray-2chunked-too-big-for-qbytearray-%llx", v) QTest::addRow("bytearray-2chunked-too-big-for-qbytearray-%zx", size_t(v))
<< ("\x5f\x40" + QByteArray(toolong, sizeof(toolong)) + '\xff') << ("\x5f\x40" + QByteArray(toolong, sizeof(toolong)) + '\xff')
<< 0 << err; << 0 << err;
toolong[0] |= 0x20; toolong[0] |= 0x20;
// QCborStreamReader::readString copies to a QByteArray first // QCborStreamReader::readString copies to a QByteArray first
QTest::addRow("string-too-big-for-qbytearray-%llx", v) QTest::addRow("string-too-big-for-qbytearray-%zx", size_t(v))
<< QByteArray(toolong, sizeof(toolong)) << 0 << err; << QByteArray(toolong, sizeof(toolong)) << 0 << err;
QTest::addRow("string-chunked-too-big-for-qbytearray-%llx", v) QTest::addRow("string-chunked-too-big-for-qbytearray-%zx", size_t(v))
<< ('\x7f' + QByteArray(toolong, sizeof(toolong)) + '\xff') << ('\x7f' + QByteArray(toolong, sizeof(toolong)) + '\xff')
<< 0 << err; << 0 << err;
QTest::addRow("string-2chunked-too-big-for-qbytearray-%llx", v) QTest::addRow("string-2chunked-too-big-for-qbytearray-%zx", size_t(v))
<< ("\x7f\x60" + QByteArray(toolong, sizeof(toolong)) + '\xff') << ("\x7f\x60" + QByteArray(toolong, sizeof(toolong)) + '\xff')
<< 0 << err; << 0 << err;
} }