Cleanup, patch from Wayne Davison:
- xmlIO.h tree.h: made xmlNodeDump() and xmlNodeDumpOutput() public
- parser.[ch] nanohttp.c HTMLtree.c HTMLparser.c tree.c: applied and
modified slightly Wayne Davison patch adding xmlStrcasecmp and
related function, fixing xmlStrncmp(), and associated cleanup
- result/HTML/entities.html.sax: updating result
Daniel
diff --git a/HTMLtree.c b/HTMLtree.c
index 2d3b8a4..6ab29ea 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -113,17 +113,11 @@
#else
value = xmlBufferContent(attr->children->content);
#endif
- if (((!xmlStrcmp(attr->name, BAD_CAST"http-equiv")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"Http-Equiv")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"HTTP-EQUIV"))) &&
- ((!xmlStrcmp(value, BAD_CAST"Content-Type")) ||
- (!xmlStrcmp(value, BAD_CAST"content-type")) ||
- (!xmlStrcmp(value, BAD_CAST"CONTENT-TYPE"))))
+ if ((!xmlStrcasecmp(attr->name, BAD_CAST"http-equiv"))
+ && (!xmlStrcasecmp(value, BAD_CAST"Content-Type")))
http = 1;
- else if ((value != NULL) &&
- ((!xmlStrcmp(attr->name, BAD_CAST"content")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"Content")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"CONTENT"))))
+ else if ((value != NULL)
+ && (!xmlStrcasecmp(attr->name, BAD_CAST"content")))
content = value;
if ((http != 0) && (content != NULL))
goto found_content;
@@ -294,17 +288,11 @@
#else
value = xmlBufferContent(attr->children->content);
#endif
- if (((!xmlStrcmp(attr->name, BAD_CAST"http-equiv")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"Http-Equiv")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"HTTP-EQUIV"))) &&
- ((!xmlStrcmp(value, BAD_CAST"Content-Type")) ||
- (!xmlStrcmp(value, BAD_CAST"content-type")) ||
- (!xmlStrcmp(value, BAD_CAST"CONTENT-TYPE"))))
+ if ((!xmlStrcasecmp(attr->name, BAD_CAST"http-equiv"))
+ && (!xmlStrcasecmp(value, BAD_CAST"Content-Type")))
http = 1;
- else if ((value != NULL) &&
- ((!xmlStrcmp(attr->name, BAD_CAST"content")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"Content")) ||
- (!xmlStrcmp(attr->name, BAD_CAST"CONTENT"))))
+ else if ((value != NULL)
+ && (!xmlStrcasecmp(attr->name, BAD_CAST"content")))
content = value;
if ((http != 0) && (content != NULL))
break;