summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-22 10:02:12 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-22 10:02:12 +0000
commitdb406f57acda8c8796a6970f80676386803918c1 (patch)
tree4e7026d5b166fb2712ccac84096042411111725a /third_party
parent4652505e3b3590b9b788fd6507c9723bbf139696 (diff)
downloadchromium_src-db406f57acda8c8796a6970f80676386803918c1.zip
chromium_src-db406f57acda8c8796a6970f80676386803918c1.tar.gz
chromium_src-db406f57acda8c8796a6970f80676386803918c1.tar.bz2
libxml: Clean up a redundant comparison.
This was already fixed upstream. Found by experimenting with a new Clang warning. BUG=none TBR=cpu Review URL: https://codereview.chromium.org/12854004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libxml/README.chromium1
-rw-r--r--third_party/libxml/src/debugXML.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium
index 02f29bf..cb9d114 100644
--- a/third_party/libxml/README.chromium
+++ b/third_party/libxml/README.chromium
@@ -33,6 +33,7 @@ if treated as a generic xmlNode object.
- Fix pretty harmless use-after-free in generate-id function.
- Merge a clang warning fix http://git.gnome.org/browse/libxml2/commit/?id=713434d2309da469d64b35e163ea6556dadccada
- Import attribute normalization fix http://git.gnome.org/browse/libxml2/commit/?id=6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d
+- Merge a redundant comparison fix http://git.gnome.org/browse/libxml2/commit/?id=2af19f985b911b6dc6ada478ba8d201d2ddc9309
To import a new snapshot of libxml:
diff --git a/third_party/libxml/src/debugXML.c b/third_party/libxml/src/debugXML.c
index 415889a..49b9a13 100644
--- a/third_party/libxml/src/debugXML.c
+++ b/third_party/libxml/src/debugXML.c
@@ -354,7 +354,6 @@ xmlCtxtGenericNodeCheck(xmlDebugCtxtPtr ctxt, xmlNodePtr node) {
(node->type != XML_ELEMENT_DECL) &&
(node->type != XML_ATTRIBUTE_DECL) &&
(node->type != XML_DTD_NODE) &&
- (node->type != XML_ELEMENT_DECL) &&
(node->type != XML_HTML_DOCUMENT_NODE) &&
(node->type != XML_DOCUMENT_NODE)) {
if (node->content != NULL)