summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2017-11-13 21:23:17 +0100
committerNick Wellnhofer <wellnhofer@aevum.de>2017-11-27 13:42:30 +0100
commitb21895717debfc513640463371e76d2d16051491 (patch)
tree655b4ce649060c341b5fcf57c612395398032f72
parent359e750482e9b54cb10c7af477cc108d21f7531c (diff)
downloadlibxml2-b21895717debfc513640463371e76d2d16051491.tar.gz
Fix -Wenum-compare warnings
Also fixes a serious bug in xmlXPtrNewRangeNodePoint.
-rw-r--r--xpath.c2
-rw-r--r--xpointer.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/xpath.c b/xpath.c
index a9f29685..5211b126 100644
--- a/xpath.c
+++ b/xpath.c
@@ -12386,7 +12386,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt,
default:
break;
}
- } else if (cur->type == type) {
+ } else if (cur->type == (xmlElementType) type) {
if (cur->type == XML_NAMESPACE_DECL)
XP_TEST_HIT_NS
else
diff --git a/xpointer.c b/xpointer.c
index c8ebff3c..6a41f079 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -467,8 +467,6 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) {
return(NULL);
if (end == NULL)
return(NULL);
- if (start->type != XPATH_POINT)
- return(NULL);
if (end->type != XPATH_POINT)
return(NULL);