author | Michael Krelin <hacker@klever.net> | 2008-01-06 23:00:18 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-06 23:05:57 (UTC) |
commit | 7b5a82f255a85fe2ef466b68e40d9eb1829c633a (patch) (side-by-side diff) | |
tree | e466813db17bd974de0b0d277f35219c393c5796 /include/opkele/expat.h | |
parent | 6a843bb112988976892058c56d5fe2f24e24300a (diff) | |
download | libopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.zip libopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.tar.gz libopkele-7b5a82f255a85fe2ef466b68e40d9eb1829c633a.tar.bz2 |
Revert "discovery: stop parser with XML_StopParser()" for now
This reverts commit 7bde7f66284b47a75bbceadc360e7f03550ace21.
because some older expat version do not support this function I don't want to
make it conditional for now.
Conflicts:
lib/discovery.cc
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/expat.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/opkele/expat.h b/include/opkele/expat.h index 97ed61a..60c41ac 100644 --- a/include/opkele/expat.h +++ b/include/opkele/expat.h @@ -10,36 +10,34 @@ namespace opkele { class expat_t { public: XML_Parser _x; expat_t() : _x(0) { } expat_t(XML_Parser x) : _x(x) { } virtual ~expat_t() throw(); expat_t& operator=(XML_Parser x); operator const XML_Parser(void) const { return _x; } operator XML_Parser(void) { return _x; } inline bool parse(const char *s,int len,bool final=false) { assert(_x); - return XML_Parse(_x,s,len,final); } - enum XML_Status stop_parser(bool resumable=false) { - assert(_x); - return XML_StopParser(_x,resumable); } + return XML_Parse(_x,s,len,final); + } virtual void start_element(const XML_Char *n,const XML_Char **a) { } virtual void end_element(const XML_Char *n) { } void set_element_handler(); virtual void character_data(const XML_Char *s,int l) { } void set_character_data_handler(); virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { } void set_processing_instruction_handler(); virtual void comment(const XML_Char *d) { } void set_comment_handler(); virtual void start_cdata_section() { } virtual void end_cdata_section() { } |