From 2fd04ff545da7e33c82c06b502c48b725287f81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 14 Jan 2009 14:19:43 +0000 Subject: [PATCH] * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28900 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp index 2910dbe410..fc2478dcbe 100644 --- a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp +++ b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/RemoteDisk.cpp @@ -320,7 +320,7 @@ RemoteDisk::_Init() return errno; } - // set receive timeout + // set receive timeout timeval timeout; timeout.tv_sec = time_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); if (packetOffset > (uint64)pos || packetOffset + packetSize <= (uint64)pos) return 0; - + // we have something to copy size_t toCopy = size_t(packetOffset + packetSize - (uint64)pos); if (toCopy > bufferSize) @@ -422,7 +422,7 @@ RemoteDisk::_SendRequest(remote_disk_header *request, size_t size, socklen_t addrSize = sizeof(sockaddr_in); ssize_t bytesReceived = recvfrom(fSocket, receiveBuffer, receiveBufferSize, 0, (sockaddr*)peerAddress, - (peerAddress ? &addrSize : 0)); + (peerAddress ? &addrSize : NULL)); if (bytesReceived < 0) { status_t error = errno; if (error != B_TIMED_OUT && error != B_WOULD_BLOCK