jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xml parser fixes

Browse Source
This commit is contained in:
Arvid Norberg
2007-08-07 06:48:47 +00:00
parent cd05e4e67c
commit f222fe8f4b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/libtorrent/xml_parse.hpp
View File

@@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_XML_PARSE_HPP #ifndef TORRENT_XML_PARSE_HPP
#define TORRENT_XML_PARSE_HPP #define TORRENT_XML_PARSE_HPP
#include <cctype>
namespace libtorrent namespace libtorrent
{ {
enum enum
@@ -47,8 +49,9 @@ namespace libtorrent
xml_parse_error xml_parse_error
}; };
// callback(int type, char const* str, char const* str2) // callback(int type, char const* name, char const* val)
// str2 is only used for attributes. str is name and str2 is value // str2 is only used for attributes. name is element or attribute
// name and val is attribute value
template <class CallbackType> template <class CallbackType>
void xml_parse(char* p, char* end, CallbackType callback) void xml_parse(char* p, char* end, CallbackType callback)
@@ -79,7 +82,7 @@ namespace libtorrent
++p; ++p;
// parse the name of the tag. // parse the name of the tag.
for (start = p; p != end && *p != '>' && *p != ' '; ++p); for (start = p; p != end && *p != '>' && !std::isspace(*p); ++p);
char* tag_name_end = p; char* tag_name_end = p;
@@ -146,11 +149,11 @@ namespace libtorrent
for (char* i = tag_name_end; i < tag_end; ++i) for (char* i = tag_name_end; i < tag_end; ++i)
{ {
// find start of attribute name // find start of attribute name
for (; i != tag_end && (*i == ' ' || *i == '\t'); ++i); for (; i != tag_end && std::isspace(*i); ++i);
if (i == tag_end) break; if (i == tag_end) break;
start = i; start = i;
// find end of attribute name // find end of attribute name
for (; i != tag_end && *i != '=' && *i != ' ' && *i != '\t'; ++i); for (; i != tag_end && *i != '=' && !std::isspace(*i); ++i);
char* name_end = i; char* name_end = i;
// look for equality sign // look for equality sign
@@ -166,7 +169,7 @@ namespace libtorrent
} }
++i; ++i;
for (; i != tag_end && (*i == ' ' || *i == '\t'); ++i); for (; i != tag_end && std::isspace(*i); ++i);
// check for parse error (values must be quoted) // check for parse error (values must be quoted)
if (i == tag_end || (*i != '\'' && *i != '\"')) if (i == tag_end || (*i != '\'' && *i != '\"'))
{ {