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

Simplify QAbstractSocket::readData()

Browse Source 
It needed refactoring after prior changes (bf6897edb0,
1ce203d05a, 48a4a67e8d).

Change-Id: I06ee3f4f70db2a71acfc8e9c1da5b4ad7524179d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Alex Trotsenko 2015-11-14 20:19:06 +02:00
parent 5b75a16e8f
commit 29af35f352
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/network/socket/qabstractsocket.cpp
View File

@ -2414,30 +2414,17 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
{ {
Q_D(QAbstractSocket); Q_D(QAbstractSocket);
// Check if the read notifier can be enabled again. // if we're not connected, return -1 indicating EOF
if (d->socketEngine && !d->socketEngine->isReadNotificationEnabled() && d->socketEngine->isValid()) if (!d->socketEngine || !d->socketEngine->isValid() || d->state != QAbstractSocket::ConnectedState)
d->socketEngine->setReadNotificationEnabled(true); return maxSize ? qint64(-1) : qint64(0);
if (!maxSize) qint64 readBytes = (maxSize && !d->isBuffered) ? d->socketEngine->read(data, maxSize)
return 0; : qint64(0);
// This is for a buffered QTcpSocket
if (d->isBuffered)
// if we're still connected, return 0 indicating there may be more data in the future
// if we're not connected, return -1 indicating EOF
return d->state == QAbstractSocket::ConnectedState ? qint64(0) : qint64(-1);
if (!d->socketEngine)
return -1; // no socket engine is probably EOF
if (!d->socketEngine->isValid())
return -1; // This is for unbuffered TCP when we already had been disconnected
if (d->state != QAbstractSocket::ConnectedState)
return -1; // This is for unbuffered TCP if we're not connected yet
qint64 readBytes = d->socketEngine->read(data, maxSize);
if (readBytes == -2) { if (readBytes == -2) {
// -2 from the engine means no bytes available (EAGAIN) so read more later // -2 from the engine means no bytes available (EAGAIN) so read more later
return 0; readBytes = 0;
} else if (readBytes < 0) { }
if (readBytes < 0) {
d->setError(d->socketEngine->error(), d->socketEngine->errorString()); d->setError(d->socketEngine->error(), d->socketEngine->errorString());
d->resetSocketLayer(); d->resetSocketLayer();
d->state = QAbstractSocket::UnconnectedState; d->state = QAbstractSocket::UnconnectedState;
@ -2452,7 +2439,6 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
readBytes); readBytes);
#endif #endif
return readBytes; return readBytes;
} }
/*! \reimp /*! \reimp