libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-09 21:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Add maxlen to readString

Browse Source
This commit is contained in:
Phillip Stephens
2015-01-28 22:20:57 -08:00
parent e868c31253
commit 39f7ed55fc
5 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Athena/FileReader.cpp
View File

@@ -298,21 +298,26 @@ bool FileReader::readBool()
return (readByte() != 0);
}
std::string FileReader::readString()
std::string FileReader::readString(atInt32 maxlen)
{
std::string ret = "";
atUint8 chr = readByte();
atInt32 i = 0;
while (chr != 0)
{
if (maxlen >= 0 && i >= maxlen - 1)
break;
ret += chr;
chr = readByte();
i++;
}
return ret;
}
std::string FileReader::readUnicode()
std::string FileReader::readUnicode(atInt32 maxlen)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
@@ -320,13 +325,18 @@ std::string FileReader::readUnicode()
std::string ret;
std::vector<short> tmp;
atInt32 i = 0;
for(;;)
{
if (maxlen >= 0 && i >= maxlen - 1)
break;
short chr = readUint16();
if (chr)
tmp.push_back(chr);
else
break;
i++;
};
utf8::utf16to8(tmp.begin(), tmp.end(), back_inserter(ret));