summaryrefslogtreecommitdiffabout
Unidiff
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 {
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();
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 {
282 pt_stack.push_back(n); 282 pt_stack.push_back(n);
283 }else if(xmode&xmode_html) { 283 }else if(xmode&xmode_html) {
284 html_start_element(n,a); 284 html_start_element(n,a);
285 }else{ 285 }else{
286 skipping = -1; stop_parser(); 286 skipping = -1;
287 } 287 }
288 }else{ 288 }else{
289 int pt_s = pt_stack.size(); 289 int pt_s = pt_stack.size();
290 if(pt_s==1) { 290 if(pt_s==1) {
@@ -367,17 +367,16 @@ namespace opkele {
367 assert(xrd); 367 assert(xrd);
368 if(is_qelement(pt_stack.back().c_str(),n)) { 368 if(is_qelement(pt_stack.back().c_str(),n)) {
369 assert(cdata==&status_string); 369 assert(cdata==&status_string);
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 }
375 }else if(is_qelement(n,NSURI_XRD "\tExpires")) { 374 }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
376 assert(xrd); 375 assert(xrd);
377 xrd->expires = util::w3c_to_time(cdata_buf); 376 xrd->expires = util::w3c_to_time(cdata_buf);
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 }
381 cdata = 0; 380 cdata = 0;
382 } 381 }
383 void character_data(const XML_Char *s,int l) { 382 void character_data(const XML_Char *s,int l) {
@@ -432,9 +431,9 @@ namespace opkele {
432 else if(rel=="openid2.local_id") 431 else if(rel=="openid2.local_id")
433 html_openid2.local_ids.add(-1,href); 432 html_openid2.local_ids.add(-1,href);
434 } 433 }
435 }else if(is_element(n,"body")) { 434 }else if(is_element(n,"body")) {
436 skipping = -1; stop_parser(); 435 skipping = -1;
437 } 436 }
438 } 437 }
439 438
440 }; 439 };