Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mark QIODevice warning cases as unlikely

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-14 01:30:19 +00:00
parent eb9e7ec4c3
commit c637654536
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/io/qiodevice.cpp
View file

@ -474,7 +474,7 @@ void QIODevice::setOpenMode(OpenMode openMode)
void QIODevice::setTextModeEnabled(bool enabled) void QIODevice::setTextModeEnabled(bool enabled)
{ {
Q_D(QIODevice); Q_D(QIODevice);
if (!isOpen()) { if (Q_UNLIKELY(!isOpen())) {
qWarning("QIODevice::setTextModeEnabled: The device is not open"); qWarning("QIODevice::setTextModeEnabled: The device is not open");
return; return;
} }
@ -631,15 +631,13 @@ qint64 QIODevice::size() const
bool QIODevice::seek(qint64 pos) bool QIODevice::seek(qint64 pos)
{ {
Q_D(QIODevice); Q_D(QIODevice);
if (d->isSequential()) { if (Q_UNLIKELY(d->isSequential())) {
qWarning("QIODevice::seek: Cannot call seek on a sequential device"); qWarning("QIODevice::seek: Cannot call seek on a sequential device");
return false; return false;
} } else if (Q_UNLIKELY(d->openMode == NotOpen)) {
if (d->openMode == NotOpen) {
qWarning("QIODevice::seek: The device is not open"); qWarning("QIODevice::seek: The device is not open");
return false; return false;
} } else if (Q_UNLIKELY(pos < 0)) {
if (pos < 0) {
qWarning("QIODevice::seek: Invalid pos: %lld", pos); qWarning("QIODevice::seek: Invalid pos: %lld", pos);
return false; return false;
} }
@ -929,7 +927,7 @@ QByteArray QIODevice::read(qint64 maxSize)
Q_UNUSED(d); Q_UNUSED(d);
#endif #endif
if (maxSize >= QBYTEARRAY_MAX) { if (Q_UNLIKELY(maxSize >= QBYTEARRAY_MAX)) {
qWarning("QIODevice::read: maxSize argument exceeds QByteArray size limit"); qWarning("QIODevice::read: maxSize argument exceeds QByteArray size limit");
maxSize = QBYTEARRAY_MAX - 1; maxSize = QBYTEARRAY_MAX - 1;
} }
@ -1061,7 +1059,7 @@ QByteArray QIODevice::readAll()
qint64 QIODevice::readLine(char *data, qint64 maxSize) qint64 QIODevice::readLine(char *data, qint64 maxSize)
{ {
Q_D(QIODevice); Q_D(QIODevice);
if (maxSize < 2) { if (Q_UNLIKELY(maxSize < 2)) {
qWarning("QIODevice::readLine: Called with maxSize < 2"); qWarning("QIODevice::readLine: Called with maxSize < 2");
return qint64(-1); return qint64(-1);
} }
@ -1166,7 +1164,7 @@ QByteArray QIODevice::readLine(qint64 maxSize)
Q_UNUSED(d); Q_UNUSED(d);
#endif #endif
if (maxSize >= QBYTEARRAY_MAX) { if (Q_UNLIKELY(maxSize >= QBYTEARRAY_MAX)) {
qWarning("QIODevice::read: maxSize argument exceeds QByteArray size limit"); qWarning("QIODevice::read: maxSize argument exceeds QByteArray size limit");
maxSize = QBYTEARRAY_MAX - 1; maxSize = QBYTEARRAY_MAX - 1;
} }