thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed SeekableReadStream::readLine to SeekableReadStream::readLine_OLD; added a new alternate SeekableReadStream::readLine() instead

Browse source 
svn-id: r34315
This commit is contained in:
Max Horn 2008-09-03 17:53:25 +00:00
parent 5c72c2fca7
commit 57e724bfc3
12 changed files with 63 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/stream.cpp
View file

@ -86,7 +86,7 @@ void MemoryReadStream::seek(int32 offs, int whence) {
#define LF 0x0A
#define CR 0x0D
char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
char *SeekableReadStream::readLine_OLD(char *buf, size_t bufSize) {
assert(buf && bufSize > 0);
char *p = buf;
size_t len = 0;
@ -202,6 +202,20 @@ char *SeekableReadStream::readLine_NEW(char *buf, size_t bufSize) {
return buf;
}
String SeekableReadStream::readLine() {
// Read a line
String line;
while (line.lastChar() != '\n') {
char buf[256];
if (!readLine_NEW(buf, 256))
break;
line += buf;
}
return line;
}
uint32 SubReadStream::read(void *dataPtr, uint32 dataSize) {
dataSize = MIN(dataSize, _end - _pos);