Skip to content

Commit a4ec662

Browse files
committed
Fix compiler warnings
1 parent ac2b313 commit a4ec662

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

src/protocols/ProtocolHttpClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ bool ProtocolHttpClient::received(const IStreamConnectionPtr& /*connection*/, co
17771777
int res = 0;
17781778
do
17791779
{
1780-
res = socket->receive(const_cast<char*>(m_receiveBuffer.data() + bytesReceived + m_sizeRemaining), static_cast<int>(bytesToRead - bytesReceived));
1780+
res = socket->receive((m_receiveBuffer.data() + bytesReceived + m_sizeRemaining), static_cast<int>(bytesToRead - bytesReceived));
17811781
if (res > 0)
17821782
{
17831783
bytesReceived += res;

src/protocols/ProtocolHttpServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ bool ProtocolHttpServer::received(const IStreamConnectionPtr& /*connection*/, co
10321032
int res = 0;
10331033
do
10341034
{
1035-
res = socket->receive(const_cast<char*>(m_receiveBuffer.data() + bytesReceived + m_sizeRemaining), static_cast<int>(bytesToRead - bytesReceived));
1035+
res = socket->receive((m_receiveBuffer.data() + bytesReceived + m_sizeRemaining), static_cast<int>(bytesToRead - bytesReceived));
10361036
if (res > 0)
10371037
{
10381038
bytesReceived += res;

src/protocols/ProtocolMqtt5Client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static std::string getUuid()
141141
strUuid.resize(50); // 37 is the exact number
142142
uuid_t uuid;
143143
uuid_generate(uuid);
144-
uuid_unparse(uuid, const_cast<char*>(strUuid.data()));
144+
uuid_unparse(uuid, strUuid.data());
145145
std::string strUuidRet = strUuid.data();
146146
return strUuidRet;
147147
}
@@ -152,7 +152,7 @@ static std::string getUuid()
152152
strUuid.resize(50); // 37 is the exact number
153153
uuid_t uuid;
154154
uuid_generate(uuid);
155-
uuid_unparse(uuid, const_cast<char*>(strUuid.data()));
155+
uuid_unparse(uuid, strUuid.data());
156156
std::string strUuidRet = strUuid.data();
157157
return strUuidRet;
158158
}

src/protocols/protocolhelpers/ProtocolDelimiter.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ bool ProtocolDelimiter::received(const IStreamConnectionPtr& /*connection*/, con
166166
m_receiveBuffer->resize(sizeDelimiterPrefix + bytesToRead);
167167
if (sizeDelimiterPrefix > 0)
168168
{
169-
memcpy(const_cast<char*>(m_receiveBuffer->data()), const_cast<char*>(receiveBufferOld->data() + indexStart), sizeDelimiterPrefix);
169+
memcpy(m_receiveBuffer->data(), const_cast<char*>(receiveBufferOld->data() + indexStart), sizeDelimiterPrefix);
170170
}
171-
int res = socket->receive(const_cast<char*>(m_receiveBuffer->data()) + sizeDelimiterPrefix, bytesToRead);
171+
int res = socket->receive(m_receiveBuffer->data() + sizeDelimiterPrefix, bytesToRead);
172172
if (res > 0)
173173
{
174174
auto callback = m_callback.lock();
@@ -214,12 +214,12 @@ bool ProtocolDelimiter::received(const IStreamConnectionPtr& /*connection*/, con
214214
{
215215
const auto& receiveBufferStore = m_receiveBuffers[n];
216216
ssize_t sizeCopy = receiveBufferStore.indexEndMessage - receiveBufferStore.indexStartMessage;
217-
memcpy(const_cast<char*>(receiveBufferHelper->data()) + offset,
218-
const_cast<char*>(receiveBufferStore.receiveBuffer->data()) + receiveBufferStore.indexStartMessage,
217+
memcpy(receiveBufferHelper->data() + offset,
218+
receiveBufferStore.receiveBuffer->data() + receiveBufferStore.indexStartMessage,
219219
sizeCopy);
220220
offset += sizeCopy;
221221
}
222-
memcpy(const_cast<char*>(receiveBufferHelper->data()) + offset, const_cast<char*>(m_receiveBuffer->data()), sizeLast);
222+
memcpy(receiveBufferHelper->data() + offset, m_receiveBuffer->data(), sizeLast);
223223
message->setReceiveBuffer(receiveBufferHelper, 0, m_receiveBuffersTotal);
224224
m_receiveBuffersTotal = 0;
225225
m_receiveBuffers.clear();

src/protocols/protocolhelpers/ProtocolFixHeaderHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool ProtocolFixHeaderHelper::receiveHeader(const SocketPtr& socket, int& bytesT
7272
{
7373
sizeRead = bytesToRead;
7474
}
75-
int res = socket->receive(const_cast<char*>(m_header.data() + m_sizeCurrent), static_cast<int>(sizeRead));
75+
int res = socket->receive(m_header.data() + m_sizeCurrent, static_cast<int>(sizeRead));
7676
if (res > 0)
7777
{
7878
int bytesReceived = res;

src/protocolsession/ProtocolMessage.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ char* ProtocolMessage::addBuffer(ssize_t size, ssize_t reserve)
9797
ssize_t sizeBuffer = sizeHeader + reserve + m_sizeTrailer;
9898
m_payloadBuffers.resize(m_payloadBuffers.size() + 1);
9999
m_payloadBuffers.back().resize(sizeBuffer);
100-
m_sendBufferRefs.push_back({const_cast<char*>(m_payloadBuffers.back().data()), sizeBuffer});
101-
m_sendPayloadRefs.push_back({const_cast<char*>(m_payloadBuffers.back().data() + sizeHeader), reserve});
100+
m_sendBufferRefs.push_back({m_payloadBuffers.back().data(), sizeBuffer});
101+
m_sendPayloadRefs.push_back({m_payloadBuffers.back().data() + sizeHeader, reserve});
102102
if (size < reserve)
103103
{
104104
downsizeLastBuffer(size);
105105
}
106-
return const_cast<char*>(m_payloadBuffers.back().data() + sizeHeader);
106+
return (m_payloadBuffers.back().data() + sizeHeader);
107107
}
108108

109109
void ProtocolMessage::downsizeLastBuffer(ssize_t newSize)
@@ -294,7 +294,7 @@ char* ProtocolMessage::resizeReceiveBuffer(ssize_t size)
294294
if (static_cast<size_t>(size) > m_receiveBuffer->size())
295295
{
296296
m_receiveBuffer->resize(size);
297-
m_receiveBufferRef.first = const_cast<char*>(m_receiveBuffer->data());
297+
m_receiveBufferRef.first = m_receiveBuffer->data();
298298
}
299299
m_receiveBufferRef.second = size;
300300
return m_receiveBufferRef.first;
@@ -305,7 +305,7 @@ void ProtocolMessage::setReceiveBuffer(const std::shared_ptr<std::string>& recei
305305
assert(receiveBuffer != nullptr);
306306
assert(offset + size <= static_cast<ssize_t>(receiveBuffer->size()));
307307
m_receiveBuffer = receiveBuffer;
308-
m_receiveBufferRef.first = const_cast<char*>(m_receiveBuffer->data()) + offset;
308+
m_receiveBufferRef.first = m_receiveBuffer->data() + offset;
309309
m_receiveBufferRef.second = size;
310310
}
311311

@@ -341,8 +341,8 @@ void ProtocolMessage::moveSendBuffers(std::list<std::string>&& payloadBuffers, c
341341
{
342342
m_payloadBuffers.emplace_back(std::move(*it));
343343
size_t size = itSize->second;
344-
m_sendBufferRefs.emplace_back(const_cast<char*>(m_payloadBuffers.back().data()), size);
345-
m_sendPayloadRefs.emplace_back(const_cast<char*>(m_payloadBuffers.back().data()), size);
344+
m_sendBufferRefs.emplace_back(m_payloadBuffers.back().data(), size);
345+
m_sendPayloadRefs.emplace_back(m_payloadBuffers.back().data(), size);
346346
m_offset = size;
347347
m_sizeLastBlock = size;
348348
m_sizeSendBufferTotal += size;
@@ -374,9 +374,9 @@ char* ProtocolMessage::addSendHeader(ssize_t size)
374374
}
375375
m_headerBuffers.resize(m_headerBuffers.size() + 1);
376376
m_headerBuffers.back().resize(size);
377-
m_sendBufferRefs.insert(m_itSendBufferRefsPayloadBegin, {const_cast<char*>(m_headerBuffers.back().data()), m_headerBuffers.back().size()});
377+
m_sendBufferRefs.insert(m_itSendBufferRefsPayloadBegin, {m_headerBuffers.back().data(), m_headerBuffers.back().size()});
378378
m_sizeSendBufferTotal += size;
379-
return const_cast<char*>(m_headerBuffers.back().data());
379+
return m_headerBuffers.back().data();
380380
}
381381
void ProtocolMessage::downsizeLastSendHeader(ssize_t newSize)
382382
{

0 commit comments

Comments
 (0)