From e85cf827a804d9abf4cbf48af6394c49331de322 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Mon, 21 Sep 2015 22:55:55 +0800 Subject: Revert "Merge tag 'upstream/2.9.1+dfsg1'" This reverts commit 21ee18bdbc9a9d4500e12a1399d51c593b8b31d4, reversing changes made to de338c1adfa336ddb5177ceb5c63bcd868a0ebc7. --- doc/html/libxml-entities.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/html/libxml-entities.html') diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html index 989805a..b7d1455 100644 --- a/doc/html/libxml-entities.html +++ b/doc/html/libxml-entities.html @@ -23,9 +23,9 @@ The content of this structure is not made public by the API. 
void	xmlDumpEntityDecl		(xmlBufferPtr buf, 
					 xmlEntityPtr ent)
const xmlChar *	xmlEncodeEntities	(xmlDocPtr doc, 
					 const xmlChar * input)
xmlChar *	xmlEncodeEntitiesReentrant	(xmlDocPtr doc, 
						 const xmlChar * input)
-
xmlChar *	xmlEncodeSpecialChars	(xmlDocPtr doc, 
					 const xmlChar * input)
+
xmlChar *	xmlEncodeSpecialChars	(const xmlDoc * doc, 
					 const xmlChar * input)
void	xmlFreeEntitiesTable		(xmlEntitiesTablePtr table)
-
xmlEntityPtr	xmlGetDocEntity		(xmlDocPtr doc, 
					 const xmlChar * name)
+
xmlEntityPtr	xmlGetDocEntity		(const xmlDoc * doc, 
					 const xmlChar * name)
xmlEntityPtr	xmlGetDtdEntity		(xmlDocPtr doc, 
					 const xmlChar * name)
xmlEntityPtr	xmlGetParameterEntity	(xmlDocPtr doc, 
					 const xmlChar * name)
xmlEntityPtr	xmlGetPredefinedEntity	(const xmlChar * name)
@@ -60,11 +60,11 @@ The content of this structure is not made public by the API.

TODO: remove xmlEncodeEntities, once we are not afraid of breaking binary compatibility People must migrate their code to xmlEncodeEntitiesReentrant ! This routine will issue a warning when encountered.

doc:the document containing the string
input:A string to convert to XML.
Returns:NULL

Function: xmlEncodeEntitiesReentrant

xmlChar *	xmlEncodeEntitiesReentrant	(xmlDocPtr doc, 
						 const xmlChar * input)

Do a global encoding of a string, replacing the predefined entities and non ASCII values with their entities and CharRef counterparts. Contrary to xmlEncodeEntities, this routine is reentrant, and result must be deallocated.

-
doc:the document containing the string
input:A string to convert to XML.
Returns:A newly allocated string with the substitution done.

Function: xmlEncodeSpecialChars

xmlChar *	xmlEncodeSpecialChars	(xmlDocPtr doc, 
					 const xmlChar * input)

+
doc:the document containing the string
input:A string to convert to XML.
Returns:A newly allocated string with the substitution done.
Function: xmlEncodeSpecialChars
xmlChar *	xmlEncodeSpecialChars	(const xmlDoc * doc, 
					 const xmlChar * input)

 
Do a global encoding of a string, replacing the predefined entities this routine is reentrant, and result must be deallocated.

 
doc:the document containing the string
input:A string to convert to XML.
Returns:A newly allocated string with the substitution done.
Function: xmlFreeEntitiesTable
void	xmlFreeEntitiesTable		(xmlEntitiesTablePtr table)

 
Deallocate the memory used by an entities hash table.

-
table:An entity table
Function: xmlGetDocEntity
xmlEntityPtr	xmlGetDocEntity		(xmlDocPtr doc, 
					 const xmlChar * name)

+
table:An entity table
Function: xmlGetDocEntity
xmlEntityPtr	xmlGetDocEntity		(const xmlDoc * doc, 
					 const xmlChar * name)

 
Do an entity lookup in the document entity hash table and

 
doc:the document referencing the entity
name:the entity name
Returns:the corresponding entity, otherwise a lookup is done in the predefined entities too. Returns A pointer to the entity structure or NULL if not found.
Function: xmlGetDtdEntity
xmlEntityPtr	xmlGetDtdEntity		(xmlDocPtr doc, 
					 const xmlChar * name)

 
Do an entity lookup in the DTD entity hash table and

-- 
cgit v1.2.3