Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2026-04-21 20:17:36 +00:00
Code Issues Projects Releases Wiki Activity

rename ProFUSE:: -> Common::

Browse Source 
git-svn-id: https://profuse.googlecode.com/svn/branches/v2@389 aa027e90-d47c-11dd-86d7-074df07e0730
This commit is contained in:
ksherlock
2011-03-14 23:08:19 +00:00
parent 02e3c4c532
commit b4db3e59ab
27 changed files with 178 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
File/File.cpp
+6 -10
View File
@@ -2,12 +2,8 @@
#include <cerrno>
#include <File/File.h>
#include <ProFUSE/Exception.h>
using ProFUSE::Exception;
using ProFUSE::POSIXException;
#include <Common/Exception.h>
#include <POSIX/Exception.h>
File::File()
@@ -49,7 +45,7 @@ File::File(const char *name, int flags)
_fd = ::open(name, flags);
if (_fd < 0)
throw POSIXException( __METHOD__ ": open", errno);
throw POSIX::Exception( __METHOD__ ": open", errno);
}
File::File(const char *name, int flags, mode_t mode)
@@ -59,7 +55,7 @@ File::File(const char *name, int flags, mode_t mode)
_fd = ::open(name, flags, mode);
if (_fd < 0)
throw POSIXException( __METHOD__ ": open", errno);
throw POSIX::Exception( __METHOD__ ": open", errno);
}
@@ -70,7 +66,7 @@ File::File(const char *name, FileFlags flags)
_fd = ::open(name, flags == ReadOnly ? O_RDONLY : O_RDWR);
if (_fd < 0)
throw POSIXException( __METHOD__ ": open", errno);
throw POSIX::Exception( __METHOD__ ": open", errno);
}
@@ -99,7 +95,7 @@ void File::close()
// destructor shouldn't throw.
/*
if (::close(fd) != 0)
throw POSIXException(__METHOD__ ": close", errno);
throw POSIX::Exception(__METHOD__ ": close", errno);
*/
}
}
File/MappedFile.cpp
+10 -12
View File
@@ -4,10 +4,8 @@
#include <sys/stat.h>
#include <File/MappedFile.h>
#include <ProFUSE/Exception.h>
using ProFUSE::POSIXException;
#include <Common/Exception.h>
#include <POSIX/Exception.h>
MappedFile::MappedFile()
{
@@ -81,16 +79,16 @@ void MappedFile::init(const File &f, bool readOnly, size_t size)
// close enough
if (f.fd() < 0)
throw POSIXException( __METHOD__, EBADF);
throw POSIX::Exception( __METHOD__, EBADF);
if (!size)
{
if (::fstat(f.fd(), &st) != 0)
throw POSIXException(__METHOD__ ": fstat", errno);
throw POSIX::Exception(__METHOD__ ": fstat", errno);
if (!S_ISREG(st.st_mode))
throw POSIXException(__METHOD__, ENODEV);
throw POSIX::Exception(__METHOD__, ENODEV);
size = st.st_size;
}
@@ -99,7 +97,7 @@ void MappedFile::init(const File &f, bool readOnly, size_t size)
_address = ::mmap(0, _length, prot, flags, f.fd(), 0);
if (_address == MAP_FAILED)
throw POSIXException(__METHOD__ ": mmap", errno);
throw POSIX::Exception(__METHOD__ ": mmap", errno);
_readOnly = readOnly;
}
@@ -127,7 +125,7 @@ void MappedFile::close()
// destructor shouldn't throw.
/*
if (::munmap(address, length) != 0)
throw POSIXException(__METHOD__ ": munmap", errno);
throw POSIX::Exception(__METHOD__ ": munmap", errno);
*/
}
}
@@ -140,7 +138,7 @@ void MappedFile::sync()
if (_address != MAP_FAILED)
{
if (::msync(_address, _length, MS_SYNC) != 0)
throw POSIXException(__METHOD__ ": msync", errno);
throw POSIX::Exception(__METHOD__ ": msync", errno);
}
}
@@ -173,14 +171,14 @@ MappedFile *MappedFile::Create(const char *name, size_t size)
if (!fd.isValid())
{
throw POSIXException(__METHOD__ ": Unable to create file.", errno);
throw POSIX::Exception(__METHOD__ ": Unable to create file.", errno);
}
// TODO -- is ftruncate portable?
if (::ftruncate(fd.fd(), size) < 0)
{
// TODO -- unlink?
throw POSIXException(__METHOD__ ": Unable to truncate file.", errno);
throw POSIX::Exception(__METHOD__ ": Unable to truncate file.", errno);
}
return new MappedFile(fd, File::ReadWrite, size);