diff options
author | Max Horn | 2009-12-30 23:00:55 +0000 |
---|---|---|
committer | Max Horn | 2009-12-30 23:00:55 +0000 |
commit | d083e02215c9ef2309f436284c750c78005df6c7 (patch) | |
tree | 8ffb99078b556210b529fe139eeea2830eece605 /common | |
parent | 47f48dd9121acc7b4ca526e9184e0f944ed9b671 (diff) | |
download | scummvm-rg350-d083e02215c9ef2309f436284c750c78005df6c7.tar.gz scummvm-rg350-d083e02215c9ef2309f436284c750c78005df6c7.tar.bz2 scummvm-rg350-d083e02215c9ef2309f436284c750c78005df6c7.zip |
Rename Common::Stream::readLine_NEW to readLine
svn-id: r46779
Diffstat (limited to 'common')
-rw-r--r-- | common/stream.cpp | 4 | ||||
-rw-r--r-- | common/stream.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/stream.cpp b/common/stream.cpp index 07ca37555d..6737eafc9c 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -94,7 +94,7 @@ enum { CR = 0x0D }; -char *SeekableReadStream::readLine_NEW(char *buf, size_t bufSize) { +char *SeekableReadStream::readLine(char *buf, size_t bufSize) { assert(buf != 0 && bufSize > 1); char *p = buf; size_t len = 0; @@ -162,7 +162,7 @@ String SeekableReadStream::readLine() { String line; while (line.lastChar() != '\n') { char buf[256]; - if (!readLine_NEW(buf, 256)) + if (!readLine(buf, 256)) break; line += buf; } diff --git a/common/stream.h b/common/stream.h index 0c8eecb6e0..02d170132d 100644 --- a/common/stream.h +++ b/common/stream.h @@ -374,7 +374,7 @@ public: * @param bufSize the size of the buffer * @return a pointer to the read string, or NULL if an error occurred */ - virtual char *readLine_NEW(char *s, size_t bufSize); + virtual char *readLine(char *s, size_t bufSize); /** |