lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

html: Remove unused or useless return codes

Browse Source 
htmlParseStartTag should always succeed (except for malloc failures).
This commit is contained in:
Nick Wellnhofer
2024-09-11 17:43:07 +02:00
parent e179f3ec0e
commit 9f04cce695
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
HTMLparser.c
View File

@ -3667,7 +3667,7 @@ htmlCheckMeta(htmlParserCtxtPtr ctxt, const xmlChar **atts) {
* Returns 0 in case of success, -1 in case of error and 1 if discarded * Returns 0 in case of success, -1 in case of error and 1 if discarded
*/ */
static int static void
htmlParseStartTag(htmlParserCtxtPtr ctxt) { htmlParseStartTag(htmlParserCtxtPtr ctxt) {
const xmlChar *name; const xmlChar *name;
const xmlChar *attname; const xmlChar *attname;
@ -3679,9 +3679,6 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
int i; int i;
int discardtag = 0; int discardtag = 0;
if ((ctxt == NULL) || (ctxt->input == NULL))
return -1;
if (CUR != '<') return -1;
SKIP(1); SKIP(1);
atts = ctxt->atts; atts = ctxt->atts;
@ -3690,7 +3687,7 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) {
GROW; GROW;
name = htmlParseHTMLName(ctxt, 0); name = htmlParseHTMLName(ctxt, 0);
if (name == NULL) if (name == NULL)
return -1; return;
if (xmlStrEqual(name, BAD_CAST"meta")) if (xmlStrEqual(name, BAD_CAST"meta"))
meta = 1; meta = 1;
@ -3850,8 +3847,6 @@ done:
xmlFree((xmlChar *) atts[i]); xmlFree((xmlChar *) atts[i]);
} }
} }
return(discardtag);
} }
/** /**
@ -3869,31 +3864,28 @@ done:
* Returns 1 if the current level should be closed. * Returns 1 if the current level should be closed.
*/ */
static int static void
htmlParseEndTag(htmlParserCtxtPtr ctxt) htmlParseEndTag(htmlParserCtxtPtr ctxt)
{ {
const xmlChar *name; const xmlChar *name;
const xmlChar *oldname; const xmlChar *oldname;
int i, ret; int i;
if ((CUR != '<') || (NXT(1) != '/')) {
return (0);
}
SKIP(2); SKIP(2);
if (CUR == '>') { if (CUR == '>') {
SKIP(1); SKIP(1);
return(0); return;
} }
if (!IS_ASCII_LETTER(CUR)) { if (!IS_ASCII_LETTER(CUR)) {
htmlParseComment(ctxt, /* bogus */ 1); htmlParseComment(ctxt, /* bogus */ 1);
return(0); return;
} }
name = htmlParseHTMLName(ctxt, 0); name = htmlParseHTMLName(ctxt, 0);
if (name == NULL) if (name == NULL)
return (0); return;
/* /*
* Parse and ignore attributes. * Parse and ignore attributes.
@ -3924,13 +3916,13 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
} else if ((CUR == '/') && (NXT(1) == '>')) { } else if ((CUR == '/') && (NXT(1) == '>')) {
SKIP(2); SKIP(2);
} else { } else {
return(0); return;
} }
if (ctxt->options & HTML_PARSE_HTML5) { if (ctxt->options & HTML_PARSE_HTML5) {
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, name); ctxt->sax->endElement(ctxt->userData, name);
return(0); return;
} }
/* /*
@ -3942,7 +3934,7 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
xmlStrEqual(name, BAD_CAST "body") || xmlStrEqual(name, BAD_CAST "body") ||
xmlStrEqual(name, BAD_CAST "head"))) { xmlStrEqual(name, BAD_CAST "head"))) {
ctxt->depth--; ctxt->depth--;
return (0); return;
} }
/* /*
@ -3956,7 +3948,7 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
if (i < 0) { if (i < 0) {
htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
"Unexpected end tag : %s\n", name, NULL); "Unexpected end tag : %s\n", name, NULL);
return (0); return;
} }
@ -3986,12 +3978,7 @@ htmlParseEndTag(htmlParserCtxtPtr ctxt)
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, name); ctxt->sax->endElement(ctxt->userData, name);
htmlnamePop(ctxt); htmlnamePop(ctxt);
ret = 1;
} else {
ret = 0;
} }
return (ret);
} }
@ -4134,7 +4121,6 @@ htmlParseElementInternal(htmlParserCtxtPtr ctxt) {
const xmlChar *name; const xmlChar *name;
const htmlElemDesc * info; const htmlElemDesc * info;
htmlParserNodeInfo node_info = { NULL, 0, 0, 0, 0 }; htmlParserNodeInfo node_info = { NULL, 0, 0, 0, 0 };
int failed;
if ((ctxt == NULL) || (ctxt->input == NULL)) if ((ctxt == NULL) || (ctxt->input == NULL))
return(0); return(0);
@ -4146,13 +4132,10 @@ htmlParseElementInternal(htmlParserCtxtPtr ctxt) {
node_info.begin_line = ctxt->input->line; node_info.begin_line = ctxt->input->line;
} }
failed = htmlParseStartTag(ctxt); htmlParseStartTag(ctxt);
name = ctxt->name; name = ctxt->name;
if ((failed == -1) || (name == NULL)) { if (name == NULL)
if (CUR == '>')
SKIP(1);
return(0); return(0);
}
/* /*
* Lookup the info for that element. * Lookup the info for that element.
@ -4934,7 +4917,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
break; break;
case XML_PARSER_START_TAG: { case XML_PARSER_START_TAG: {
const xmlChar *name; const xmlChar *name;
int failed, next; int next;
const htmlElemDesc * info; const htmlElemDesc * info;
/* /*
@ -4965,14 +4948,10 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
} }
failed = htmlParseStartTag(ctxt); htmlParseStartTag(ctxt);
name = ctxt->name; name = ctxt->name;
if ((failed == -1) || if (name == NULL)
(name == NULL)) {
if (CUR == '>')
SKIP(1);
break; break;
}
/* /*
* Lookup the info for that element. * Lookup the info for that element.