aboutsummaryrefslogtreecommitdiffstats
path: root/HTMLtree.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2002-03-06 21:39:42 +0000
committerDaniel Veillard <veillard@src.gnome.org>2002-03-06 21:39:42 +0000
commit4e0e29746889d4a70728e6406eed2f546287bdd6 (patch)
tree4ed60303bdd125885d709608ded57fbdab02c320 /HTMLtree.c
parente915b2d423f00add4abd968390e96edcf5d7e6a4 (diff)
downloadandroid_external_libxml2-4e0e29746889d4a70728e6406eed2f546287bdd6.tar.gz
android_external_libxml2-4e0e29746889d4a70728e6406eed2f546287bdd6.tar.bz2
android_external_libxml2-4e0e29746889d4a70728e6406eed2f546287bdd6.zip
fixed some htmlSetMetaEncoding() problems fixup and integrated tests for
* HTMLtree.c: fixed some htmlSetMetaEncoding() problems * python/libxml.c python/tests/Makefile.am python/tests/serialize.py: fixup and integrated tests for the serialization stuff Daniel
Diffstat (limited to 'HTMLtree.c')
-rw-r--r--HTMLtree.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/HTMLtree.c b/HTMLtree.c
index 3113670d..c0e00501 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -242,11 +242,9 @@ found_meta:
xmlAttrPtr attr = cur->properties;
int http;
const xmlChar *value;
- int same_charset;
content = NULL;
http = 0;
- same_charset = 0;
while (attr != NULL) {
if ((attr->children != NULL) &&
(attr->children->type == XML_TEXT_NODE) &&
@@ -264,17 +262,13 @@ found_meta:
if ((value != NULL) &&
(!xmlStrcasecmp(attr->name, BAD_CAST"content")))
content = value;
- else
- if ((!xmlStrcasecmp(attr->name, BAD_CAST"charset"))
- && (!xmlStrcasecmp(value, encoding)))
- same_charset = 1;
}
- if ((http != 0) && (content != NULL) && (same_charset != 0))
+ if ((http != 0) && (content != NULL))
break;
}
attr = attr->next;
}
- if ((http != 0) && (content != NULL) && (same_charset != 0)) {
+ if ((http != 0) && (content != NULL)) {
meta = cur;
cur = cur->next;
xmlUnlinkNode(meta);