summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -22,12 +22,10 @@ namespace opkele {
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();
diff --git a/lib/discovery.cc b/lib/discovery.cc
index af9686a..d868308 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -282,9 +282,9 @@ namespace opkele {
pt_stack.push_back(n);
}else if(xmode&xmode_html) {
html_start_element(n,a);
}else{
- skipping = -1; stop_parser();
+ skipping = -1;
}
}else{
int pt_s = pt_stack.size();
if(pt_s==1) {
@@ -367,17 +367,16 @@ namespace opkele {
assert(xrd);
if(is_qelement(pt_stack.back().c_str(),n)) {
assert(cdata==&status_string);
pt_stack.pop_back();
- if(status_code!=100) {
- skipping = -1; stop_parser();
- }
+ if(status_code!=100)
+ skipping = -1;
}
}else if(is_qelement(n,NSURI_XRD "\tExpires")) {
assert(xrd);
xrd->expires = util::w3c_to_time(cdata_buf);
}else if((xmode&xmode_html) && is_element(n,"head")) {
- skipping = -1; stop_parser();
+ skipping = -1;
}
cdata = 0;
}
void character_data(const XML_Char *s,int l) {
@@ -432,9 +431,9 @@ namespace opkele {
else if(rel=="openid2.local_id")
html_openid2.local_ids.add(-1,href);
}
}else if(is_element(n,"body")) {
- skipping = -1; stop_parser();
+ skipping = -1;
}
}
};