Call other mask function instead of implementing it twice
authorKurt Pattyn <pattyn.kurt@gmail.com>
Sat, 12 Oct 2013 19:00:17 +0000 (21:00 +0200)
committerKurt Pattyn <pattyn.kurt@gmail.com>
Sun, 13 Oct 2013 14:58:17 +0000 (16:58 +0200)
Change-Id: Ib196422ed7de2da420010e89347c98a02affef9a
Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
src/websockets/qwebsocketprotocol.cpp

index e1f3afb..9acc8ed 100644 (file)
@@ -134,24 +134,7 @@ Version versionFromString(const QString &versionString)
     */
 void mask(QByteArray *payload, quint32 maskingKey)
 {
-    quint32 *payloadData = reinterpret_cast<quint32 *>(payload->data());
-    const quint32 numIterations = static_cast<quint32>(payload->size()) / sizeof(quint32);
-    const quint32 remainder = static_cast<quint32>(payload->size()) % sizeof(quint32);
-    quint32 i;
-    for (i = 0; i < numIterations; ++i)
-    {
-        *(payloadData + i) ^= maskingKey;
-    }
-    if (remainder)
-    {
-        const quint32 offset = i * static_cast<quint32>(sizeof(quint32));
-        char *payloadBytes = payload->data();
-        const uchar *mask = reinterpret_cast<uchar *>(&maskingKey);
-        for (quint32 i = 0; i < remainder; ++i)
-        {
-            *(payloadBytes + offset + i) ^= static_cast<char>(mask[(i + offset) % 4]);
-        }
-    }
+    mask(payload->data(), payload->size(), maskingKey);
 }
 
 /*!