diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2022-09-13 11:22:02 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2022-09-13 11:22:02 +0900 |
commit | aee72dbc8a3bc08ead76cb808ffa332aa413f2d7 (patch) | |
tree | 14ed1a05c3f7c738934b3381991948def269b7e4 /libexslt/dynamic.c | |
parent | 478150ad4e1d828cd9a7e500314d1dd2a273b73e (diff) | |
download | libxslt-aee72dbc8a3bc08ead76cb808ffa332aa413f2d7.tar.gz libxslt-aee72dbc8a3bc08ead76cb808ffa332aa413f2d7.tar.bz2 libxslt-aee72dbc8a3bc08ead76cb808ffa332aa413f2d7.zip |
Imported Upstream version 1.1.35upstream/1.1.35
Diffstat (limited to 'libexslt/dynamic.c')
-rw-r--r-- | libexslt/dynamic.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/libexslt/dynamic.c b/libexslt/dynamic.c index a8cc72d9..91ceb409 100644 --- a/libexslt/dynamic.c +++ b/libexslt/dynamic.c @@ -23,17 +23,10 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(_WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) -#include <win32config.h> -#else -#include "config.h" -#endif - #include <libxml/tree.h> #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <libxslt/xsltconfig.h> #include <libxslt/xsltutils.h> #include <libxslt/xsltInternals.h> #include <libxslt/extensions.h> @@ -195,19 +188,19 @@ exsltDynMapFunction(xmlXPathParserContextPtr ctxt, int nargs) break; case XPATH_BOOLEAN: if (container != NULL) { - xmlNodePtr cur = + xmlNodePtr newChildNode = xmlNewTextChild((xmlNodePtr) container, NULL, BAD_CAST "boolean", BAD_CAST (subResult-> boolval ? "true" : "")); - if (cur != NULL) { - cur->ns = - xmlNewNs(cur, + if (newChildNode != NULL) { + newChildNode->ns = + xmlNewNs(newChildNode, BAD_CAST "http://exslt.org/common", BAD_CAST "exsl"); xmlXPathNodeSetAddUnique(ret->nodesetval, - cur); + newChildNode); } } break; @@ -216,37 +209,37 @@ exsltDynMapFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlChar *val = xmlXPathCastNumberToString(subResult-> floatval); - xmlNodePtr cur = + xmlNodePtr newChildNode = xmlNewTextChild((xmlNodePtr) container, NULL, BAD_CAST "number", val); if (val != NULL) xmlFree(val); - if (cur != NULL) { - cur->ns = - xmlNewNs(cur, + if (newChildNode != NULL) { + newChildNode->ns = + xmlNewNs(newChildNode, BAD_CAST "http://exslt.org/common", BAD_CAST "exsl"); xmlXPathNodeSetAddUnique(ret->nodesetval, - cur); + newChildNode); } } break; case XPATH_STRING: if (container != NULL) { - xmlNodePtr cur = + xmlNodePtr newChildNode = xmlNewTextChild((xmlNodePtr) container, NULL, BAD_CAST "string", subResult->stringval); - if (cur != NULL) { - cur->ns = - xmlNewNs(cur, + if (newChildNode != NULL) { + newChildNode->ns = + xmlNewNs(newChildNode, BAD_CAST "http://exslt.org/common", BAD_CAST "exsl"); xmlXPathNodeSetAddUnique(ret->nodesetval, - cur); + newChildNode); } } break; |