libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 01:05:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Clean up ReadStream::readString

Browse Source
This commit is contained in:
SupSuper 2021-05-31 23:03:31 +01:00
parent 2ffcd00393
commit 721b7376bb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/stream.cpp
View File

@ -55,16 +55,18 @@ SeekableReadStream *ReadStream::readStream(uint32 dataSize) {
Common::String ReadStream::readString(char terminator, size_t len) {
Common::String result;
char c;
bool end = false;
size_t bytesRead = 0;
while ((c = (char)readByte()) != terminator && result.size() < len && !eos())
result += c;
// If the string terminated early, skip the remaining bytes
if (!eos() && len != Common::String::npos && result.size() < len - 1) {
size_t skipBytes = len - result.size() - 1; // skip terminator
for (size_t i = 0; i < skipBytes; i++) {
readByte();
}
while (bytesRead < len && !(end && len == Common::String::npos)) {
c = (char)readByte();
if (eos())
break;
if (c == terminator)
end = true;
if (!end)
result += c;
bytesRead++;
}
return result;