epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

avoid deprecated ByteBuffer::getArray()

Browse Source 
use identical, but not overloaded, getBuffer()
This commit is contained in:
Michael Davidsaver
2019-05-19 14:09:38 -07:00
parent bd7ae12143
commit 32ba2f32d0
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/remote/blockingUDPTransport.cpp
+3 -3
View File
@@ -216,7 +216,7 @@ void BlockingUDPTransport::run() {
try {
char* recvfrom_buffer_start = (char*)(_receiveBuffer.getArray()+RECEIVE_BUFFER_PRE_RESERVE);
char* recvfrom_buffer_start = (char*)(_receiveBuffer.getBuffer()+RECEIVE_BUFFER_PRE_RESERVE);
size_t recvfrom_buffer_len =_receiveBuffer.getSize()-RECEIVE_BUFFER_PRE_RESERVE;
while(!_closed.get())
{
@@ -438,7 +438,7 @@ bool BlockingUDPTransport::send(ByteBuffer* buffer, const osiSockAddr& address)
buffer->getRemaining(), _remoteName.c_str(), inetAddressToString(address).c_str());
}
int retval = sendto(_channel, buffer->getArray(),
int retval = sendto(_channel, buffer->getBuffer(),
buffer->getLimit(), 0, &(address.sa), sizeof(sockaddr));
if(unlikely(retval<0))
{
@@ -475,7 +475,7 @@ bool BlockingUDPTransport::send(ByteBuffer* buffer, InetAddressType target) {
buffer->getRemaining(), _remoteName.c_str(), inetAddressToString(_sendAddresses[i]).c_str());
}
int retval = sendto(_channel, buffer->getArray(),
int retval = sendto(_channel, buffer->getBuffer(),
buffer->getLimit(), 0, &(_sendAddresses[i].sa),
sizeof(sockaddr));
if(unlikely(retval<0))
src/remote/codec.cpp
+2 -2
View File
@@ -1257,7 +1257,7 @@ int BlockingTCPTransportCodec::write(
while((remaining=src->getRemaining()) > 0) {
int bytesSent = ::send(_channel,
&src->getArray()[src->getPosition()],
&src->getBuffer()[src->getPosition()],
remaining, 0);
// NOTE: do not log here, you might override SOCKERRNO relevant to recv() operation above
@@ -1317,7 +1317,7 @@ int BlockingTCPTransportCodec::read(epics::pvData::ByteBuffer* dst) {
std::size_t pos = dst->getPosition();
int bytesRead = recv(_channel,
(char*)(dst->getArray()+pos), remaining, 0);
(char*)(dst->getBuffer()+pos), remaining, 0);
// NOTE: do not log here, you might override SOCKERRNO relevant to recv() operation above