lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

tree: Make xmlNodeListGetStringInternal work with escape flags

Browse Source
This commit is contained in:
Nick Wellnhofer
2025-05-09 20:13:43 +02:00
parent 442c1903af
commit 63535d3922
4 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
entities.c
View File

@@ -759,28 +759,6 @@ xmlEscapeText(const xmlChar *text, int flags) {
return(buffer);
}
/**
* See xmlEncodeEntitiesReentrant(). Allows extra flags.
*
* @param doc the document containing the string (optional)
* @param input A string to convert to XML.
* @param flags XML_ESCAPE flags
* @returns a newly allocated string with substitutions.
*/
xmlChar *
xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input,
unsigned flags) {
if (input == NULL)
return(NULL);
if ((doc != NULL) && (doc->type == XML_HTML_DOCUMENT_NODE))
flags |= XML_ESCAPE_HTML;
else if ((doc == NULL) || (doc->encoding == NULL))
flags |= XML_ESCAPE_NON_ASCII;
return(xmlEscapeText(input, flags));
}
/**
* Replace special characters with predefined entities or numeric
* character references.
@@ -796,13 +774,25 @@ xmlEncodeEntitiesInternal(xmlDocPtr doc, const xmlChar *input,
* Silently removes some invalid characters like ASCII control
* codes.
*
* See xmlEncodeSpecialChars() for an alternative.
*
* @param doc the document containing the string (optional)
* @param input A string to convert to XML.
* @returns a newly allocated string with substitutions.
*/
xmlChar *
xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
return xmlEncodeEntitiesInternal(doc, input, 0);
int flags = 0;
if (input == NULL)
return(NULL);
if ((doc != NULL) && (doc->type == XML_HTML_DOCUMENT_NODE))
flags |= XML_ESCAPE_HTML;
else if ((doc == NULL) || (doc->encoding == NULL))
flags |= XML_ESCAPE_NON_ASCII;
return(xmlEscapeText(input, flags));
}
/**