Unify end-of-file handling

[libs/core.git] / source / io / memory.cpp

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index f89d9fc894c26d207e6e3b8300d9f9dc99c6f7ae..fa8f9053de029e3965f1fd4c261a43e6c4a69c1c 100644 (file)
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -39,7 +39,7 @@ void Memory::init(char *b, char *e, Mode m)
 
 unsigned Memory::do_write(const char *buf, unsigned size)
 {
-       check_mode(M_WRITE);
+       check_access(M_WRITE);
 
        size = min<unsigned>(size, end-pos);
        memcpy(pos, buf, size);
@@ -51,7 +51,7 @@ unsigned Memory::do_read(char *buf, unsigned size)
 {
        if(pos==end)
        {
-               eof_flag = true;
+               set_eof();
                return 0;
        }
 
@@ -63,7 +63,7 @@ unsigned Memory::do_read(char *buf, unsigned size)
 
 unsigned Memory::put(char c)
 {
-       check_mode(M_WRITE);
+       check_access(M_WRITE);
        *pos++ = c;
        return 1;
 }
@@ -81,14 +81,14 @@ int Memory::get()
 {
        if(pos==end)
        {
-               eof_flag = true;
+               set_eof();
                return -1;
        }
 
        return static_cast<unsigned char>(*pos++);
 }
 
-unsigned Memory::seek(int off, SeekType type)
+SeekOffset Memory::seek(SeekOffset off, SeekType type)
 {
        char *new_pos;
        if(type==S_BEG)
@@ -107,16 +107,5 @@ unsigned Memory::seek(int off, SeekType type)
        return pos-begin;
 }
 
-const Handle &Memory::get_event_handle()
-{
-       throw logic_error("Memory doesn't support events");
-}
-
-void Memory::check_mode(Mode m) const
-{
-       if(m==M_WRITE && !(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
-}
-
 } // namespace IO
 } // namespace Msp