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

Simplify QDataStream::skipRawData()

Browse Source 
... by using the new QIODevice::skip() function.

Change-Id: I943c4feb896d677f3150da542950595d7f485e75
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Alex Trotsenko 2017-08-29 13:41:20 +03:00
parent 3088f73cf4
commit 29ef0d2bcc
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/corelib/io/qdatastream.cpp
View File

@ -1385,32 +1385,13 @@ int QDataStream::writeRawData(const char *s, int len)
int QDataStream::skipRawData(int len)
{
CHECK_STREAM_PRECOND(-1)
if (q_status != Ok && dev->isTransactionStarted())
return -1;
if (dev->isSequential()) {
char buf[4096];
int sumRead = 0;
while (len > 0) {
int blockSize = qMin(len, (int)sizeof(buf));
int n = readBlock(buf, blockSize);
if (n == -1)
return -1;
if (n == 0)
return sumRead;
sumRead += n;
len -= blockSize;
}
return sumRead;
} else {
qint64 pos = dev->pos();
qint64 size = dev->size();
if (pos + len > size)
len = size - pos;
if (!dev->seek(pos + len))
return -1;
return len;
}
const int skipResult = dev->skip(len);
if (skipResult != len)
setStatus(ReadPastEnd);
return skipResult;
}
QT_END_NAMESPACE