diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-08-09 19:23:48 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2014-08-09 19:23:48 -0700 |
| commit | bddaf98342a461f4e02389d4db390098fb423fbf (patch) | |
| tree | 30e472aa10754b2c93a24a3519387b766e814907 /src/BWebSocket.cc | |
| parent | 032872bf6f7c14b0fdbc9cd75daae56bbeb50af0 (diff) | |
Fixing even more warnings.
Diffstat (limited to 'src/BWebSocket.cc')
| -rw-r--r-- | src/BWebSocket.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/BWebSocket.cc b/src/BWebSocket.cc index 339ac3a..e6c9c1d 100644 --- a/src/BWebSocket.cc +++ b/src/BWebSocket.cc @@ -21,7 +21,7 @@ Balau::WebSocketFrame::WebSocketFrame(const uint8_t * data, size_t len, uint8_t maskPtr = m_data + 2; } else if (m_len < 65536) { m_data[1] |= 126; - m_data[2] = m_len >> 8; + m_data[2] = (m_len >> 8) & 0xff; m_data[3] = m_len & 0xff; maskPtr = m_data + 4; } else { @@ -61,7 +61,7 @@ void Balau::WebSocketFrame::send(Balau::IO<Balau::Handle> socket) { size_t totalLen = m_headerSize + m_len; if (m_mask) { - for (int i = m_headerSize; i < totalLen; i++) { + for (size_t i = m_headerSize; i < totalLen; i++) { m_data[i] ^= m_mask >> 24; m_mask = rotate(m_mask); } @@ -218,7 +218,7 @@ void Balau::WebSocketWorker::Do() { *payloadP = (uint8_t *) realloc(*payloadP, *totalLenP + (*opcodeP == OPCODE_TEXT ? 1 : 0)); case READ_PL: while (*remainingBytesP) { - int r = m_socket->read(*payloadP + *totalLenP - *remainingBytesP, *remainingBytesP); + ssize_t r = m_socket->read(*payloadP + *totalLenP - *remainingBytesP, *remainingBytesP); if (m_socket->isClosed()) return; if (r < 0) |