From 1b0f3ba4f5b9ba9b5edb07abc303cec7496f3a4c Mon Sep 17 00:00:00 2001 From: ksherlock Date: Mon, 31 May 2010 00:13:56 +0000 Subject: [PATCH] git-svn-id: https://profuse.googlecode.com/svn/branches/v2@307 aa027e90-d47c-11dd-86d7-074df07e0730 --- Cache/BlockCache.cpp | 2 -- Device/RawDevice.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cache/BlockCache.cpp b/Cache/BlockCache.cpp index f9327fa..b6670b5 100644 --- a/Cache/BlockCache.cpp +++ b/Cache/BlockCache.cpp @@ -22,8 +22,6 @@ using namespace Device; using ProFUSE::Exception; using ProFUSE::POSIXException; -#pragma mark - -#pragma mark BlockCache BlockCache::BlockCache(BlockDevice *device) { diff --git a/Device/RawDevice.cpp b/Device/RawDevice.cpp index 7c9dbc4..11c1494 100644 --- a/Device/RawDevice.cpp +++ b/Device/RawDevice.cpp @@ -188,7 +188,7 @@ void RawDevice::read(unsigned block, void *bp) // apple - read full native block(s) ? off_t offset = block * 512; - size_t ok = ::pread(_file.fd(), bp, 512, offset); + ssize_t ok = ::pread(_file.fd(), bp, 512, offset); // TODO -- EINTR? if (ok != 512) @@ -211,7 +211,7 @@ void RawDevice::read(TrackSector ts, void *bp) // apple - read full native block(s) ? off_t offset = (ts.track * 16 + ts.sector) * 256; - size_t ok = ::pread(_file.fd(), bp, 256, offset); + ssize_t ok = ::pread(_file.fd(), bp, 256, offset); // TODO -- EINTR? if (ok != 256) @@ -233,7 +233,7 @@ void RawDevice::write(unsigned block, const void *bp) off_t offset = block * 512; - size_t ok = ::pwrite(_file.fd(), bp, 512, offset); + ssize_t ok = ::pwrite(_file.fd(), bp, 512, offset); if (ok != 512) throw ok < 0 @@ -255,7 +255,7 @@ void RawDevice::write(TrackSector ts, const void *bp) off_t offset = (ts.track * 16 + ts.sector) * 256; - size_t ok = ::pwrite(_file.fd(), bp, 256, offset); + ssize_t ok = ::pwrite(_file.fd(), bp, 256, offset); if (ok != 256) throw ok < 0