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 | |
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 | ||||
-rw-r--r-- | lib/discovery.cc | 11 |
2 files changed, 7 insertions, 10 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 @@ -25,6 +25,4 @@ namespace opkele { 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); + } diff --git a/lib/discovery.cc b/lib/discovery.cc index af9686a..d868308 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc @@ -285,3 +285,3 @@ namespace opkele { }else{ - skipping = -1; stop_parser(); + skipping = -1; } @@ -370,5 +370,4 @@ namespace opkele { pt_stack.pop_back(); - if(status_code!=100) { - skipping = -1; stop_parser(); - } + if(status_code!=100) + skipping = -1; } @@ -378,3 +377,3 @@ namespace opkele { }else if((xmode&xmode_html) && is_element(n,"head")) { - skipping = -1; stop_parser(); + skipping = -1; } @@ -435,3 +434,3 @@ namespace opkele { }else if(is_element(n,"body")) { - skipping = -1; stop_parser(); + skipping = -1; } |