i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28900 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-01-14 14:19:43 +00:00
parent 33d17f74e0
commit 2fd04ff545
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp
+3 -3
View File
@@ -320,7 +320,7 @@ RemoteDisk::_Init()
return errno; return errno;
} }
// set receive timeout // set receive timeout
timeval timeout; timeval timeout;
timeout.tv_sec = time_t(kReceiveTimeout / 1000000LL); timeout.tv_sec = time_t(kReceiveTimeout / 1000000LL);
timeout.tv_usec = suseconds_t(kReceiveTimeout % 1000000LL); timeout.tv_usec = suseconds_t(kReceiveTimeout % 1000000LL);
@@ -356,7 +356,7 @@ RemoteDisk::_ReadFromPacket(off_t& pos, uint8*& buffer, size_t& bufferSize)
uint32 packetSize = ntohs(header->size); uint32 packetSize = ntohs(header->size);
if (packetOffset > (uint64)pos || packetOffset + packetSize <= (uint64)pos) if (packetOffset > (uint64)pos || packetOffset + packetSize <= (uint64)pos)
return 0; return 0;
// we have something to copy // we have something to copy
size_t toCopy = size_t(packetOffset + packetSize - (uint64)pos); size_t toCopy = size_t(packetOffset + packetSize - (uint64)pos);
if (toCopy > bufferSize) if (toCopy > bufferSize)
@@ -422,7 +422,7 @@ RemoteDisk::_SendRequest(remote_disk_header *request, size_t size,
socklen_t addrSize = sizeof(sockaddr_in); socklen_t addrSize = sizeof(sockaddr_in);
ssize_t bytesReceived = recvfrom(fSocket, receiveBuffer, ssize_t bytesReceived = recvfrom(fSocket, receiveBuffer,
receiveBufferSize, 0, (sockaddr*)peerAddress, receiveBufferSize, 0, (sockaddr*)peerAddress,
(peerAddress ? &addrSize : 0)); (peerAddress ? &addrSize : NULL));
if (bytesReceived < 0) { if (bytesReceived < 0) {
status_t error = errno; status_t error = errno;
if (error != B_TIMED_OUT && error != B_WOULD_BLOCK if (error != B_TIMED_OUT && error != B_WOULD_BLOCK