diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 14:35:59 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 14:35:59 +0000 |
| commit | 30d080ffc5cafb313f0d693cb30c29cccffb4c1a (patch) | |
| tree | 683499e8864bcc0b0b21b8835d7c44539eea1a3f /third_party/libxml | |
| parent | 79a4f1cba1706b021e537f1227f6d6a06806b573 (diff) | |
| download | chromium_src-30d080ffc5cafb313f0d693cb30c29cccffb4c1a.zip chromium_src-30d080ffc5cafb313f0d693cb30c29cccffb4c1a.tar.gz chromium_src-30d080ffc5cafb313f0d693cb30c29cccffb4c1a.tar.bz2 | |
Merge a libxml clang warning fix
This fixes the following warning:
/usr/local/google/work/chrome/src/third_party/libxml/src/xpath.c:12269:13: warning: comparison of constant 18 with expression of type 'xmlXPathTypeVal' is always false [-Wtautological-constant-out-of-range-compare]
if (type == XML_NAMESPACE_DECL)
~~~~ ^ ~~~~~~~~~~~~~~~~~~
The upstream fix is at http://git.gnome.org/browse/libxml2/commit/?id=713434d2309da469d64b35e163ea6556dadccada
TEST=none
BUG=151927
Review URL: https://codereview.chromium.org/10984039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml')
| -rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libxml/src/xpath.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index ad79493..ba588c4 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -31,6 +31,7 @@ Modifications: - Change the xmlNs struct a little bit, so it looks like it has no children 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 To import a new snapshot of libxml: diff --git a/third_party/libxml/src/xpath.c b/third_party/libxml/src/xpath.c index 4e6f29d..9423ef8 100644 --- a/third_party/libxml/src/xpath.c +++ b/third_party/libxml/src/xpath.c @@ -12266,7 +12266,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, break; } } else if (cur->type == type) { - if (type == XML_NAMESPACE_DECL) + if (cur->type == XML_NAMESPACE_DECL) XP_TEST_HIT_NS else XP_TEST_HIT |