diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-04-30 12:57:09 +0200 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-04-30 13:18:17 +0200 |
| commit | fa993130f91a09c5b8d1454514a4ad44dd54f116 (patch) | |
| tree | bdc7d9e563cc9dab70e5d29c829351eab7b8a0ba | |
| parent | a5bc4605838335dd6bee9374fcb6b4718b2f5a5a (diff) | |
| download | libxml2-fa993130f91a09c5b8d1454514a4ad44dd54f116.tar.gz | |
xpath: Remove remaining references to valueFrame
Fixes #529.
| -rw-r--r-- | include/libxml/xpath.h | 2 | ||||
| -rw-r--r-- | include/libxml/xpathInternals.h | 2 | ||||
| -rw-r--r-- | xpointer.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index b57985a2..6dae0780 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -400,7 +400,7 @@ struct _xmlXPathParserContext { int xptr; /* it this an XPointer expression */ xmlNodePtr ancestor; /* used for walking preceding axis */ - int valueFrame; /* unused */ + int valueFrame; /* always zero for compatibility */ }; /************************************************************************ diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h index cb0991d7..870055f9 100644 --- a/include/libxml/xpathInternals.h +++ b/include/libxml/xpathInternals.h @@ -297,7 +297,7 @@ XMLPUBFUN void * if (ctxt == NULL) return; \ if (nargs != (x)) \ XP_ERROR(XPATH_INVALID_ARITY); \ - if (ctxt->valueNr < ctxt->valueFrame + (x)) \ + if (ctxt->valueNr < (x)) \ XP_ERROR(XPATH_STACK_ERROR); /** @@ -1248,7 +1248,6 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { ctxt->valueNr = 0; ctxt->valueMax = 10; ctxt->value = NULL; - ctxt->valueFrame = 0; } SKIP_BLANKS; if (CUR == '/') { |