Move io functions into the util namespace

This commit is contained in:
Danny Robson 2011-10-01 01:58:10 +10:00
parent 6b0db35db7
commit f02501eb5e
3 changed files with 43 additions and 39 deletions

3
io.cpp
View File

@ -11,10 +11,11 @@
using namespace std;
using namespace util;
//----------------------------------------------------------------------------
uint8_t *
slurp (const boost::filesystem::path& path) {
util::slurp (const boost::filesystem::path& path) {
fd_ref fd(open (path.string ().c_str (), O_RDONLY)); // | O_CLOEXEC));
// Calculate the total file size

78
io.hpp
View File

@ -25,57 +25,59 @@
#include <cstdio>
#include <cstdint>
#include <memory>
#include <boost/filesystem.hpp>
/// Specifies bitwise combinations of IO access rights.
enum access_t {
ACCESS_READ = 1 << 0,
ACCESS_WRITE = 1 << 1,
ACCESS_READWRITE = ACCESS_READ | ACCESS_WRITE
};
#include <boost/filesystem/path.hpp>
/// Reads an entire file into memory. Caller frees the result. Guarantees a
/// null trailing byte.
uint8_t *
slurp (const boost::filesystem::path&) mustuse;
namespace util {
/// Specifies bitwise combinations of IO access rights.
enum access_t {
ACCESS_READ = 1 << 0,
ACCESS_WRITE = 1 << 1,
ACCESS_READWRITE = ACCESS_READ | ACCESS_WRITE
};
/// A simple RAII wrapper for file descriptors
struct fd_ref {
public:
int fd;
fd_ref (int _fd);
~fd_ref ();
/// Reads an entire file into memory. Caller frees the result. Guarantees a
/// null trailing byte.
uint8_t *
slurp (const boost::filesystem::path&) mustuse;
operator int (void) const;
};
/// A simple RAII wrapper for file descriptors
struct fd_ref {
public:
int fd;
fd_ref (int _fd);
~fd_ref ();
operator int (void) const;
};
#if defined(HAVE_MMAP)
/// Wraps a mechanism to map a file into memory. Read only.
class mapped_file {
protected:
fd_ref m_fd;
uint8_t *m_data;
size_t m_size;
/// Wraps a mechanism to map a file into memory. Read only.
class mapped_file {
protected:
fd_ref m_fd;
uint8_t *m_data;
size_t m_size;
void load_fd (void);
void load_fd (void);
public:
mapped_file (const char *path);
mapped_file (const std::string &path);
mapped_file (const boost::filesystem::path &path);
public:
mapped_file (const char *path);
mapped_file (const std::string &path);
mapped_file (const boost::filesystem::path &path);
mapped_file (const mapped_file &rhs);
mapped_file& operator =(const mapped_file &rhs);
mapped_file (const mapped_file &rhs);
mapped_file& operator =(const mapped_file &rhs);
~mapped_file ();
~mapped_file ();
const uint8_t* data (void) const;
size_t size (void) const;
};
const uint8_t* data (void) const;
size_t size (void) const;
};
#endif
}
#endif

View File

@ -36,6 +36,7 @@
using namespace std;
using namespace util;
/*
* Parsing