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

Get rid of readLine_OLD for good

Browse source 
svn-id: r35229
This commit is contained in:
Max Horn 2008-12-03 22:55:30 +00:00
parent 9ad879af48
commit abae99d645
2 changed files with 4 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

68
common/stream.cpp
View file

@ -89,70 +89,10 @@ bool MemoryReadStream::seek(int32 offs, int whence) {
return true; // FIXME: STREAM REWRITE return true; // FIXME: STREAM REWRITE
} }
#define LF 0x0A enum {
#define CR 0x0D LF = 0x0A,
CR = 0x0D
char *SeekableReadStream::readLine_OLD(char *buf, size_t bufSize) { };
assert(buf && bufSize > 0);
char *p = buf;
size_t len = 0;
char c;
if (buf == 0 || bufSize == 0 || eos()) {
return 0;
}
// We don't include the newline character(s) in the buffer, and we
// always terminate it - we never read more than len-1 characters.
// EOF is treated as a line break, unless it was the first character
// that was read.
// 0 is treated as a line break, even though it should never occur in
// a text file.
// DOS and Windows use CRLF line breaks
// Unix and OS X use LF line breaks
// Macintosh before OS X uses CR line breaks
c = readByte();
if (eos() || ioFailed()) {
return 0;
}
while (!eos() && len + 1 < bufSize) {
if (ioFailed())
return 0;
if (c == 0 || c == LF)
break;
if (c == CR) {
c = readByte();
if (c != LF && !eos())
seek(-1, SEEK_CUR);
break;
}
*p++ = c;
len++;
c = readByte();
}
// This should fix a bug while using readLine with Common::File
// it seems that it sets the eos flag after an invalid read
// and at the same time the ioFailed flag
// the config file parser fails out of that reason for the new themes
if (eos()) {
clearIOFailed();
}
*p = 0;
return buf;
}
char *SeekableReadStream::readLine_NEW(char *buf, size_t bufSize) { char *SeekableReadStream::readLine_NEW(char *buf, size_t bufSize) {
assert(buf != 0 && bufSize > 1); assert(buf != 0 && bufSize > 1);

5
common/stream.h
View file

@ -367,11 +367,6 @@ public:
*/ */
virtual bool skip(uint32 offset) { return seek(offset, SEEK_CUR); } virtual bool skip(uint32 offset) { return seek(offset, SEEK_CUR); }
/**
* DEPRECATED: Do not use this method! Instead use readLine_NEW() or readline().
*/
virtual char *readLine_OLD(char *buf, size_t bufSize);
/** /**
* Reads at most one less than the number of characters specified * Reads at most one less than the number of characters specified
* by bufSize from the and stores them in the string buf. Reading * by bufSize from the and stores them in the string buf. Reading