oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ExpatParser: add Parse() overload with buffer

Browse Source
This commit is contained in:
Max Kellermann 2014-01-09 20:34:56 +01:00
parent 2ed1c22227
commit 12b139beaf
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Expat.cxx
View File

@ -36,6 +36,18 @@ ExpatParser::SetError(Error &error)
XML_ErrorString(code));
}
bool
ExpatParser::Parse(const char *data, size_t length, bool is_final,
Error &error)
{
bool success = XML_Parse(parser, data, length,
is_final) == XML_STATUS_OK;
if (!success)
SetError(error);
return success;
}
bool
ExpatParser::Parse(InputStream &is, Error &error)
{
@ -47,21 +59,14 @@ ExpatParser::Parse(InputStream &is, Error &error)
if (nbytes == 0)
break;
if (XML_Parse(parser, buffer, nbytes, false) != XML_STATUS_OK) {
SetError(error);
if (!Parse(buffer, nbytes, false, error))
return false;
}
}
if (error.IsDefined())
return false;
if (XML_Parse(parser, "", 0, true) != XML_STATUS_OK) {
SetError(error);
return false;
}
return true;
return Parse("", 0, true, error);
}
const char *

8
src/Expat.hxx
View File

@ -50,6 +50,9 @@ public:
XML_SetCharacterDataHandler(parser, charhndl);
}
bool Parse(const char *data, size_t length, bool is_final,
Error &error);
bool Parse(InputStream &is, Error &error);
gcc_pure
@ -73,6 +76,11 @@ public:
parser.SetCharacterDataHandler(CharacterData);
}
bool Parse(const char *data, size_t length, bool is_final,
Error &error) {
return parser.Parse(data, length, is_final, error);
}
bool Parse(InputStream &is, Error &error) {
return parser.Parse(is, error);
}