summaryrefslogtreecommitdiff
path: root/src/buffer.cpp
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2011-01-20 18:09:04 +0000
committerMike Buland <eichlan@xagasoft.com>2011-01-20 18:09:04 +0000
commit393f1b414746a7f1977971dd7659dd2b47092b11 (patch)
tree81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/buffer.cpp
parentc259f95bd0e58b247940a339bb9b4b401b4e9438 (diff)
parent7e25a863325dc3e9762397e700030969e093b087 (diff)
downloadlibbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz
libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2
libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz
libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically update your projects.
Diffstat (limited to 'src/buffer.cpp')
-rw-r--r--src/buffer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/buffer.cpp b/src/buffer.cpp
index 234dc92..b54f97e 100644
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2007-2010 Xagasoft, All rights reserved. 2 * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
3 * 3 *
4 * This file is part of the libbu++ library and is released under the 4 * This file is part of the libbu++ library and is released under the
5 * terms of the license contained in the file LICENSE. 5 * terms of the license contained in the file LICENSE.
@@ -32,7 +32,7 @@ void Bu::Buffer::start()
32{ 32{
33} 33}
34 34
35size_t Bu::Buffer::stop() 35Bu::size Bu::Buffer::stop()
36{ 36{
37 iReadBufFill = iReadPos = iWriteBufFill = iWritePos = 0; 37 iReadBufFill = iReadPos = iWriteBufFill = iWritePos = 0;
38 return sSoFar; 38 return sSoFar;
@@ -49,7 +49,7 @@ void Bu::Buffer::fillReadBuf()
49 } 49 }
50} 50}
51 51
52size_t Bu::Buffer::read( void *pBuf, size_t nBytes ) 52Bu::size Bu::Buffer::read( void *pBuf, Bu::size nBytes )
53{ 53{
54 if( nBytes <= 0 ) 54 if( nBytes <= 0 )
55 { 55 {
@@ -57,7 +57,7 @@ size_t Bu::Buffer::read( void *pBuf, size_t nBytes )
57 return 0; 57 return 0;
58 } 58 }
59 59
60 size_t nTotRead = 0; 60 Bu::size nTotRead = 0;
61// fillReadBuf(); 61// fillReadBuf();
62 62
63 do 63 do
@@ -87,9 +87,9 @@ size_t Bu::Buffer::read( void *pBuf, size_t nBytes )
87 return nTotRead; 87 return nTotRead;
88} 88}
89 89
90size_t Bu::Buffer::write( const void *pBuf, size_t nBytes ) 90Bu::size Bu::Buffer::write( const void *pBuf, Bu::size nBytes )
91{ 91{
92 size_t nTotWrote = 0; 92 Bu::size nTotWrote = 0;
93 93
94 do 94 do
95 { 95 {