summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-01-06 23:00:18 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-06 23:05:57 (UTC)
commit7b5a82f255a85fe2ef466b68e40d9eb1829c633a (patch) (unidiff)
treee466813db17bd974de0b0d277f35219c393c5796
parent6a843bb112988976892058c56d5fe2f24e24300a (diff)
downloadlibopkele-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/expat.h6
-rw-r--r--lib/discovery.cc11
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 {
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
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 {
285 }else{ 285 }else{
286 skipping = -1; stop_parser(); 286 skipping = -1;
287 } 287 }
@@ -370,5 +370,4 @@ namespace opkele {
370 pt_stack.pop_back(); 370 pt_stack.pop_back();
371 if(status_code!=100) { 371 if(status_code!=100)
372 skipping = -1; stop_parser(); 372 skipping = -1;
373 }
374 } 373 }
@@ -378,3 +377,3 @@ namespace opkele {
378 }else if((xmode&xmode_html) && is_element(n,"head")) { 377 }else if((xmode&xmode_html) && is_element(n,"head")) {
379 skipping = -1; stop_parser(); 378 skipping = -1;
380 } 379 }
@@ -435,3 +434,3 @@ namespace opkele {
435 }else if(is_element(n,"body")) { 434 }else if(is_element(n,"body")) {
436 skipping = -1; stop_parser(); 435 skipping = -1;
437 } 436 }