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) (unidiff) | |
tree | e466813db17bd974de0b0d277f35219c393c5796 /include | |
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 { | |||
10 | 10 | ||
11 | class expat_t { | 11 | class expat_t { |
12 | public: | 12 | public: |
13 | XML_Parser _x; | 13 | XML_Parser _x; |
14 | 14 | ||
15 | expat_t() : _x(0) { } | 15 | expat_t() : _x(0) { } |
16 | expat_t(XML_Parser x) : _x(x) { } | 16 | expat_t(XML_Parser x) : _x(x) { } |
17 | virtual ~expat_t() throw(); | 17 | virtual ~expat_t() throw(); |
18 | 18 | ||
19 | expat_t& operator=(XML_Parser x); | 19 | expat_t& operator=(XML_Parser x); |
20 | 20 | ||
21 | operator const XML_Parser(void) const { return _x; } | 21 | operator const XML_Parser(void) const { return _x; } |
22 | operator XML_Parser(void) { return _x; } | 22 | operator XML_Parser(void) { return _x; } |
23 | 23 | ||
24 | inline bool parse(const char *s,int len,bool final=false) { | 24 | inline bool parse(const char *s,int len,bool final=false) { |
25 | assert(_x); | 25 | assert(_x); |
26 | return XML_Parse(_x,s,len,final); } | 26 | return XML_Parse(_x,s,len,final); |
27 | enum XML_Status stop_parser(bool resumable=false) { | 27 | } |
28 | assert(_x); | ||
29 | return XML_StopParser(_x,resumable); } | ||
30 | 28 | ||
31 | virtual void start_element(const XML_Char *n,const XML_Char **a) { } | 29 | virtual void start_element(const XML_Char *n,const XML_Char **a) { } |
32 | virtual void end_element(const XML_Char *n) { } | 30 | virtual void end_element(const XML_Char *n) { } |
33 | void set_element_handler(); | 31 | void set_element_handler(); |
34 | 32 | ||
35 | virtual void character_data(const XML_Char *s,int l) { } | 33 | virtual void character_data(const XML_Char *s,int l) { } |
36 | void set_character_data_handler(); | 34 | void set_character_data_handler(); |
37 | 35 | ||
38 | virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { } | 36 | virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { } |
39 | void set_processing_instruction_handler(); | 37 | void set_processing_instruction_handler(); |
40 | 38 | ||
41 | virtual void comment(const XML_Char *d) { } | 39 | virtual void comment(const XML_Char *d) { } |
42 | void set_comment_handler(); | 40 | void set_comment_handler(); |
43 | 41 | ||
44 | virtual void start_cdata_section() { } | 42 | virtual void start_cdata_section() { } |
45 | virtual void end_cdata_section() { } | 43 | virtual void end_cdata_section() { } |