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

NetworkReply[wasm]: simplify some buffer passing

Browse Source 
It was always passing a QByteArray to a const char * argument,
with the size along with it. That was immediately converted
back to a QByteArray. Instead, just pass the byte array
which anyway knows its size.

Needed for a followup commit

Change-Id: I821d419adcb600456826dde67fb92ecad11cb290
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2024-04-04 10:39:06 +02:00
parent eca0512b08
commit a786404036
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/access/qnetworkreplywasmimpl.cpp
View File

@ -318,10 +318,11 @@ void QNetworkReplyWasmImplPrivate::emitDataReadProgress(qint64 bytesReceived, qi
emit q->downloadProgress(bytesReceived, bytesTotal); emit q->downloadProgress(bytesReceived, bytesTotal);
} }
void QNetworkReplyWasmImplPrivate::dataReceived(const QByteArray &buffer, int bufferSize) void QNetworkReplyWasmImplPrivate::dataReceived(const QByteArray &buffer)
{ {
Q_Q(QNetworkReplyWasmImpl); Q_Q(QNetworkReplyWasmImpl);
const qsizetype bufferSize = buffer.size();
if (bufferSize > 0) if (bufferSize > 0)
q->setReadBufferSize(bufferSize); q->setReadBufferSize(bufferSize);
@ -334,7 +335,7 @@ void QNetworkReplyWasmImplPrivate::dataReceived(const QByteArray &buffer, int bu
totalDownloadSize = downloadBufferCurrentSize; totalDownloadSize = downloadBufferCurrentSize;
downloadBuffer.append(buffer, bufferSize); downloadBuffer.append(buffer);
emit q->readyRead(); emit q->readyRead();
} }
@ -476,7 +477,7 @@ void QNetworkReplyWasmImplPrivate::downloadSucceeded(emscripten_fetch_t *fetch)
if (reply) { if (reply) {
if (reply->state != QNetworkReplyPrivate::Aborted) { if (reply->state != QNetworkReplyPrivate::Aborted) {
QByteArray buffer(fetch->data, fetch->numBytes); QByteArray buffer(fetch->data, fetch->numBytes);
reply->dataReceived(buffer, buffer.size()); reply->dataReceived(buffer);
QByteArray statusText(fetch->statusText); QByteArray statusText(fetch->statusText);
reply->setStatusCode(fetch->status, statusText); reply->setStatusCode(fetch->status, statusText);
reply->setReplyFinished(); reply->setReplyFinished();
@ -539,7 +540,7 @@ void QNetworkReplyWasmImplPrivate::downloadFailed(emscripten_fetch_t *fetch)
else else
reasonStr = QString::fromUtf8(fetch->statusText); reasonStr = QString::fromUtf8(fetch->statusText);
QByteArray buffer(fetch->data, fetch->numBytes); QByteArray buffer(fetch->data, fetch->numBytes);
reply->dataReceived(buffer, buffer.size()); reply->dataReceived(buffer);
QByteArray statusText(fetch->statusText); QByteArray statusText(fetch->statusText);
reply->setStatusCode(fetch->status, statusText); reply->setStatusCode(fetch->status, statusText);
reply->emitReplyError(reply->statusCodeFromHttp(fetch->status, reply->request.url()), reasonStr); reply->emitReplyError(reply->statusCodeFromHttp(fetch->status, reply->request.url()), reasonStr);

4
src/network/access/qnetworkreplywasmimpl_p.h
View File

@ -57,7 +57,7 @@ public:
Q_PRIVATE_SLOT(d_func(), void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString)) Q_PRIVATE_SLOT(d_func(), void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString))
Q_PRIVATE_SLOT(d_func(), void emitDataReadProgress(qint64 done, qint64 total)) Q_PRIVATE_SLOT(d_func(), void emitDataReadProgress(qint64 done, qint64 total))
Q_PRIVATE_SLOT(d_func(), void dataReceived(char *buffer, int bufferSize)) Q_PRIVATE_SLOT(d_func(), void dataReceived(const QByteArray &buffer))
private: private:
QByteArray methodName() const; QByteArray methodName() const;
@ -75,7 +75,7 @@ public:
void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &); void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &);
void emitDataReadProgress(qint64 done, qint64 total); void emitDataReadProgress(qint64 done, qint64 total);
void dataReceived(const QByteArray &buffer, int bufferSize); void dataReceived(const QByteArray &buffer);
void headersReceived(const QByteArray &buffer); void headersReceived(const QByteArray &buffer);
void setStatusCode(int status, const QByteArray &statusText); void setStatusCode(int status, const QByteArray &statusText);