Use size_t for sizes in I/O classes

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

diff --git a/source/io/file.cpp b/source/io/file.cpp
index d44dad3b751d8a5550a153ea07114b8da80c3c6d..5ead278813d7bd73e8c9eae38282e8b07f1d0bd4 100644 (file)
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -32,7 +32,13 @@ void File::set_block(bool b)
        sys_set_blocking(handle, b);
 }
 
-unsigned File::do_write(const char *buf, unsigned size)
+void File::set_inherit(bool i)
+{
+       adjust_mode(mode, M_INHERIT, i);
+       sys_set_inherit(handle, i);
+}
+
+size_t File::do_write(const char *buf, size_t size)
 {
        check_access(M_WRITE);
 
@@ -47,14 +53,14 @@ unsigned File::do_write(const char *buf, unsigned size)
        return sys_write(handle, buf, size);
 }
 
-unsigned File::do_read(char *buf, unsigned size)
+size_t File::do_read(char *buf, size_t size)
 {
        check_access(M_READ);
 
        if(size==0)
                return 0;
 
-       unsigned ret = sys_read(handle, buf, size);
+       size_t ret = sys_read(handle, buf, size);
        if(ret==0)
                set_eof();
 
@@ -91,23 +97,33 @@ BufferedFile::BufferedFile(const string &fn, Mode m, File::CreateMode cm):
        file.signal_end_of_file.connect(sigc::mem_fun(this, &BufferedFile::set_eof));
 }
 
-unsigned BufferedFile::do_write(const char *buf, unsigned size)
+void BufferedFile::set_block(bool b)
+{
+       file.set_block(b);
+}
+
+void BufferedFile::set_inherit(bool)
 {
-       unsigned ret = buffer.write(buf, size);
+       throw logic_error("BufferedFile::set_inherit");
+}
+
+size_t BufferedFile::do_write(const char *buf, size_t size)
+{
+       size_t ret = buffer.write(buf, size);
        position += ret;
        return ret;
 }
 
-unsigned BufferedFile::do_read(char *buf, unsigned size)
+size_t BufferedFile::do_read(char *buf, size_t size)
 {
-       unsigned ret = buffer.read(buf, size);
+       size_t ret = buffer.read(buf, size);
        position += ret;
        return ret;
 }
 
-unsigned BufferedFile::put(char c)
+size_t BufferedFile::put(char c)
 {
-       unsigned ret = buffer.put(c);
+       size_t ret = buffer.put(c);
        position += ret;
        return ret;
 }
@@ -128,6 +144,11 @@ int BufferedFile::get()
        return ret;
 }
 
+const Handle &BufferedFile::get_handle(Mode)
+{
+       throw logic_error("BufferedFile::get_handle");
+}
+
 SeekOffset BufferedFile::seek(SeekOffset offset, SeekType type)
 {
        if(type==S_CUR)