summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket.cpp
diff options
context:
space:
mode:
authorAlex Trotsenko <alex1973tr@gmail.com>2016-01-29 12:46:13 +0200
committerAlex Trotsenko <alex1973tr@gmail.com>2016-02-01 20:45:21 +0000
commit57ca755d2efbdb7268e8014cb4c50c9ea1c65bfc (patch)
treeff8459ea7129c501526b7c58cbecde50d6d9f857 /src/network/socket/qabstractsocket.cpp
parent9fb5ff56c35177502791f1e979b2eca1881a70e5 (diff)
QRingBuffer: add append(const char *, qint64) function
This allows to remove a code duplication in several places. Change-Id: I49f56e951682dbd2968923654a12cba5199a2502 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
-rw-r--r--src/network/socket/qabstractsocket.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index ccc6e91147..04b80569ee 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -2481,8 +2481,7 @@ qint64 QAbstractSocket::writeData(const char *data, qint64 size)
d->setError(d->socketEngine->error(), d->socketEngine->errorString());
} else if (written < size) {
// Buffer what was not written yet
- char *ptr = d->writeBuffer.reserve(size - written);
- memcpy(ptr, data + written, size - written);
+ d->writeBuffer.append(data + written, size - written);
written = size;
d->socketEngine->setWriteNotificationEnabled(true);
}
@@ -2515,12 +2514,7 @@ qint64 QAbstractSocket::writeData(const char *data, qint64 size)
// We just write to our write buffer and enable the write notifier
// The write notifier then flush()es the buffer.
- char *ptr = d->writeBuffer.reserve(size);
- if (size == 1)
- *ptr = *data;
- else
- memcpy(ptr, data, size);
-
+ d->writeBuffer.append(data, size);
qint64 written = size;
if (d->socketEngine && !d->writeBuffer.isEmpty())