Use size_t for sizes in I/O classes

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

diff --git a/source/io/buffered.cpp b/source/io/buffered.cpp
index 2836e4bbbaeb879de07be26bf5fba2ecea8fcad9..55c69a635cf69d0a6b8f41b0f2eec67a028b16e7 100644 (file)
--- a/source/io/buffered.cpp
+++ b/source/io/buffered.cpp
@@ -61,7 +61,7 @@ void Buffered::flush()
                begin = end = buf;
 }
 
-unsigned Buffered::do_write(const char *data, unsigned size)
+size_t Buffered::do_write(const char *data, size_t size)
 {
        set_op(M_WRITE);
 
@@ -92,7 +92,7 @@ unsigned Buffered::do_write(const char *data, unsigned size)
        }
 }
 
-unsigned Buffered::do_read(char *data, unsigned size)
+size_t Buffered::do_read(char *data, size_t size)
 {
        set_op(M_READ);
 
@@ -110,7 +110,7 @@ unsigned Buffered::do_read(char *data, unsigned size)
        {
                // Give out whatever is in the buffer already
                memcpy(data, begin, end-begin);
-               unsigned ret = end-begin;
+               size_t ret = end-begin;
                begin = end = buf;
 
                data += ret;
@@ -119,10 +119,10 @@ unsigned Buffered::do_read(char *data, unsigned size)
                if(size<buf_size)
                {
                        // Fill the buffer and serve the rest of the request from it
-                       unsigned len = below.read(end, buf+buf_size-end);
+                       size_t len = below.read(end, buf+buf_size-end);
                        end += len;
 
-                       len = min(static_cast<unsigned>(end-begin), size);
+                       len = min<size_t>(end-begin, size);
                        memcpy(data, begin, len);
                        begin += len;
                        ret += len;
@@ -137,7 +137,7 @@ unsigned Buffered::do_read(char *data, unsigned size)
        }
 }
 
-unsigned Buffered::put(char c)
+size_t Buffered::put(char c)
 {
        set_op(M_WRITE);
 
@@ -190,7 +190,7 @@ void Buffered::set_op(Mode op)
        cur_op = op;
 }
 
-unsigned Buffered::get_current_size() const
+size_t Buffered::get_current_size() const
 {
        return end-begin;
 }