From 126c3993d2ad55db2abfe80e3d671bf584e7b13b Mon Sep 17 00:00:00 2001 From: akirilov Date: Fri, 1 Jun 2018 13:46:04 -0700 Subject: RESTRICT AUTOMERGE: Update libxml2 to 2.9.8 Merge to pi-dev and restore Android.mk Bug: 79662501 Bug: 36809766 Bug: 36810305 Bug: 62151041 Test: manually verify functionality for regression Change-Id: Ife351c91c932eb92992656f8ea5c08724a220306 (cherry picked from commit 4e91cfdbb1a8624e5cd5a850d6e17da11d1e34a8) --- doc/html/libxml-hash.html | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'doc/html/libxml-hash.html') diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html index 922e3f19..021adb8f 100644 --- a/doc/html/libxml-hash.html +++ b/doc/html/libxml-hash.html @@ -17,14 +17,15 @@ The content of this structure is not made public by the API. 
int	xmlHashAddEntry2		(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 void * userdata)
int	xmlHashAddEntry3		(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3, 
					 void * userdata)
Function type: xmlHashCopier
-void *	xmlHashCopier			(void * payload, 
					 xmlChar * name)
+void *	xmlHashCopier			(void * payload, 
					 const xmlChar * name)
 
xmlHashTablePtr	xmlHashCopy		(xmlHashTablePtr table, 
					 xmlHashCopier f)
xmlHashTablePtr	xmlHashCreate		(int size)
xmlHashTablePtr	xmlHashCreateDict	(int size, 
					 xmlDictPtr dict)
Function type: xmlHashDeallocator
-void	xmlHashDeallocator		(void * payload, 
					 xmlChar * name)
+void	xmlHashDeallocator		(void * payload, 
					 const xmlChar * name)
+
void	xmlHashDefaultDeallocator	(void * entry, 
					 const xmlChar * name)
void	xmlHashFree			(xmlHashTablePtr table, 
					 xmlHashDeallocator f)
void *	xmlHashLookup			(xmlHashTablePtr table, 
					 const xmlChar * name)
void *	xmlHashLookup2			(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2)
@@ -40,7 +41,7 @@ void xmlHashDeallocator (void * payload,
void xmlHashScanFull (xmlHashTablePtr table,
xmlHashScannerFull f,
void * data) 
void	xmlHashScanFull3		(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3, 
					 xmlHashScannerFull f, 
					 void * data)
Function type: xmlHashScanner
-void	xmlHashScanner			(void * payload, 
					 void * data, 
					 xmlChar * name)
+void	xmlHashScanner			(void * payload, 
					 void * data, 
					 const xmlChar * name)
 
Function type: xmlHashScannerFull
 void	xmlHashScannerFull		(void * payload, 
					 void * data, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3)
@@ -60,18 +61,20 @@ The content of this structure is not made public by the API.
 
table:the hash table
name:the name of the userdata
name2:a second name of the userdata
userdata:a pointer to the userdata
Returns:0 the addition succeeded and -1 in case of error.
Function: xmlHashAddEntry3
int	xmlHashAddEntry3		(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3, 
					 void * userdata)

 
Add the @userdata to the hash @table. This can later be retrieved by using the tuple (@name, @name2, @name3). Duplicate entries generate errors.

 
table:the hash table
name:the name of the userdata
name2:a second name of the userdata
name3:a third name of the userdata
userdata:a pointer to the userdata
Returns:0 the addition succeeded and -1 in case of error.
Function type: xmlHashCopier
Function type: xmlHashCopier
-void *	xmlHashCopier			(void * payload, 
					 xmlChar * name)
+void *	xmlHashCopier			(void * payload, 
					 const xmlChar * name)
 
Callback to copy data from a hash.
payload:the data in the hash
name:the name associated
Returns:a copy of the data or NULL in case of error.


 
Function: xmlHashCopy
xmlHashTablePtr	xmlHashCopy		(xmlHashTablePtr table, 
					 xmlHashCopier f)

 
Scan the hash @table and applied @f to each value.

 
table:the hash table
f:the copier function for items in the hash
Returns:the new table or NULL in case of error.
Function: xmlHashCreate
xmlHashTablePtr	xmlHashCreate		(int size)

 
Create a new xmlHashTablePtr.

-
size:the size of the hash table
Returns:the newly created object, or NULL if an error occured.
Function: xmlHashCreateDict
xmlHashTablePtr	xmlHashCreateDict	(int size, 
					 xmlDictPtr dict)

+
size:the size of the hash table
Returns:the newly created object, or NULL if an error occurred.
Function: xmlHashCreateDict
xmlHashTablePtr	xmlHashCreateDict	(int size, 
					 xmlDictPtr dict)

 
Create a new xmlHashTablePtr which will use @dict as the internal dictionary

-
size:the size of the hash table
dict:a dictionary to use for the hash
Returns:the newly created object, or NULL if an error occured.
Function type: xmlHashDeallocator
Function type: xmlHashDeallocator
-void	xmlHashDeallocator		(void * payload, 
					 xmlChar * name)
+
size:the size of the hash table
dict:a dictionary to use for the hash
Returns:the newly created object, or NULL if an error occurred.
Function type: xmlHashDeallocator
Function type: xmlHashDeallocator
+void	xmlHashDeallocator		(void * payload, 
					 const xmlChar * name)
 
Callback to free data from a hash.
payload:the data in the hash
name:the name associated


-
Function: xmlHashFree
void	xmlHashFree			(xmlHashTablePtr table, 
					 xmlHashDeallocator f)

+
Function: xmlHashDefaultDeallocator
void	xmlHashDefaultDeallocator	(void * entry, 
					 const xmlChar * name)

+
Free a hash table entry with xmlFree.

+
entry:the hash table entry
name:the entry's name
Function: xmlHashFree
void	xmlHashFree			(xmlHashTablePtr table, 
					 xmlHashDeallocator f)

 
Free the hash @table and its contents. The userdata is deallocated with @f if provided.

 
table:the hash table
f:the deallocator function for items in the hash
Function: xmlHashLookup
void *	xmlHashLookup			(xmlHashTablePtr table, 
					 const xmlChar * name)

 
Find the userdata specified by the @name.

@@ -100,7 +103,7 @@ void	xmlHashDeallocator		(void * payload, 
					 
table:the hash table
f:the scanner function for items in the hash
data:extra data passed to f
Function: xmlHashScanFull3
void	xmlHashScanFull3		(xmlHashTablePtr table, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3, 
					 xmlHashScannerFull f, 
					 void * data)

 
Scan the hash @table and applied @f to each value matching (@name, @name2, @name3) tuple. If one of the names is null, the comparison is considered to match.

 
table:the hash table
name:the name of the userdata or NULL
name2:a second name of the userdata or NULL
name3:a third name of the userdata or NULL
f:the scanner function for items in the hash
data:extra data passed to f
Function type: xmlHashScanner
Function type: xmlHashScanner
-void	xmlHashScanner			(void * payload, 
					 void * data, 
					 xmlChar * name)
+void	xmlHashScanner			(void * payload, 
					 void * data, 
					 const xmlChar * name)
 
Callback when scanning data in a hash with the simple scanner.
payload:the data in the hash
data:extra scannner data
name:the name associated


 
Function type: xmlHashScannerFull
Function type: xmlHashScannerFull
 void	xmlHashScannerFull		(void * payload, 
					 void * data, 
					 const xmlChar * name, 
					 const xmlChar * name2, 
					 const xmlChar * name3)
-- 
cgit v1.2.3