diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index edabfdb2..f8c19f83 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -784,7 +784,6 @@
-
@@ -1299,14 +1298,15 @@
interfaces for tree manipulation
this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree
Daniel Veillard
-
+
+
@@ -1600,8 +1600,6 @@
-
-
@@ -3513,9 +3511,6 @@
Macro to cast a string to an xmlChar * when one know its safe.
-
- default buffer size 4000.
-
Macro to try to cast the value on the top of the XPath stack to a boolean.
@@ -4138,9 +4133,13 @@
+
+
Macro for compatibility naming layer with libxml1. Maps to "children."
+
+
Automatically generated by genChRanges.py
@@ -14722,16 +14721,6 @@ crash if you try to modify the tree)'/>
-
-
-
-
-
-
-
-
-
-
@@ -14773,11 +14762,6 @@ crash if you try to modify the tree)'/>
-
-
-
-
-
diff --git a/globals.c b/globals.c
index 2a163368..340eed6c 100644
--- a/globals.c
+++ b/globals.c
@@ -247,35 +247,10 @@ xmlPosixStrdup(const char *cur) {
*/
xmlStrdupFunc xmlMemStrdup = xmlPosixStrdup;
-/**
- * xmlBufferAllocScheme:
- *
- * DEPRECATED: Don't use.
- *
- * Global setting, default allocation policy for buffers, default is
- * XML_BUFFER_ALLOC_EXACT
- */
-const xmlBufferAllocationScheme xmlBufferAllocScheme = XML_BUFFER_ALLOC_EXACT;
-/**
- * xmlDefaultBufferSize:
- *
- * DEPRECATED: Don't use.
- *
- * Global setting, default buffer size. Default value is BASE_BUFFER_SIZE
- */
-const int xmlDefaultBufferSize = BASE_BUFFER_SIZE;
-
/*
* Parser defaults
*/
-/**
- * xmlParserDebugEntities:
- *
- * DEPRECATED, always 0.
- */
-const int xmlParserDebugEntities = 0;
-
static int xmlDoValidityCheckingDefaultValueThrDef = 0;
static int xmlGetWarningsDefaultValueThrDef = 1;
static int xmlLoadExtDtdDefaultValueThrDef = 0;
@@ -905,16 +880,6 @@ xmlThrDefSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler) {
xmlMutexUnlock(&xmlThrDefMutex);
}
-xmlBufferAllocationScheme
-xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v ATTRIBUTE_UNUSED) {
- return xmlBufferAllocScheme;
-}
-
-int
-xmlThrDefDefaultBufferSize(int v ATTRIBUTE_UNUSED) {
- return xmlDefaultBufferSize;
-}
-
int xmlThrDefDoValidityCheckingDefaultValue(int v) {
int ret;
xmlMutexLock(&xmlThrDefMutex);
@@ -989,10 +954,6 @@ int xmlThrDefLoadExtDtdDefaultValue(int v) {
return ret;
}
-int xmlThrDefParserDebugEntities(int v ATTRIBUTE_UNUSED) {
- return(xmlParserDebugEntities);
-}
-
int xmlThrDefPedanticParserDefaultValue(int v) {
int ret;
xmlMutexLock(&xmlThrDefMutex);
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 090a3a41..b5c74429 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -974,8 +974,6 @@ XMLPUBVAR const char *const xmlParserVersion;
/** DOC_DISABLE */
XML_DEPRECATED
-XMLPUBVAR const int xmlParserDebugEntities;
-XML_DEPRECATED
XMLPUBVAR const xmlSAXLocator xmlDefaultSAXLocator;
#ifdef LIBXML_SAX1_ENABLED
XML_DEPRECATED
@@ -1095,9 +1093,6 @@ XMLPUBFUN int
XML_DEPRECATED
XMLPUBFUN int
xmlThrDefLoadExtDtdDefaultValue(int v);
-XML_DEPRECATED
-XMLPUBFUN int
- xmlThrDefParserDebugEntities(int v);
#ifdef LIBXML_SAX1_ENABLED
/*
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index fbbb591a..e5a8fb70 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -32,6 +32,12 @@
extern "C" {
#endif
+/*
+ * Backward compatibility
+ */
+#define xmlBufferAllocScheme XML_BUFFER_ALLOC_EXACT
+#define xmlDefaultBufferSize 4096
+
/*
* Some of the basic types pointer to structures:
*/
@@ -59,13 +65,6 @@ typedef xmlSAXHandler *xmlSAXHandlerPtr;
typedef struct _xmlEntity xmlEntity;
typedef xmlEntity *xmlEntityPtr;
-/**
- * BASE_BUFFER_SIZE:
- *
- * default buffer size 4000.
- */
-#define BASE_BUFFER_SIZE 4096
-
/**
* LIBXML_NAMESPACE_DICT:
*
@@ -679,11 +678,6 @@ typedef void (*xmlDeregisterNodeFunc) (xmlNodePtr node);
*/
/** DOC_DISABLE */
-XML_DEPRECATED
-XMLPUBVAR const xmlBufferAllocationScheme xmlBufferAllocScheme;
-XML_DEPRECATED
-XMLPUBVAR const int xmlDefaultBufferSize;
-
XML_DEPRECATED
XMLPUBFUN xmlRegisterNodeFunc *__xmlRegisterNodeDefaultValue(void);
XML_DEPRECATED
@@ -1322,11 +1316,6 @@ XML_DEPRECATED
XMLPUBFUN xmlDeregisterNodeFunc
xmlThrDefDeregisterNodeDefault(xmlDeregisterNodeFunc func);
-XML_DEPRECATED XMLPUBFUN xmlBufferAllocationScheme
- xmlThrDefBufferAllocScheme (xmlBufferAllocationScheme v);
-XML_DEPRECATED XMLPUBFUN int
- xmlThrDefDefaultBufferSize (int v);
-
#ifdef __cplusplus
}
#endif
diff --git a/python/generator.py b/python/generator.py
index 9854796f..0284171d 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -391,14 +391,12 @@ deprecated_funcs = {
'xmlStringDecodeEntities': True,
'xmlStringLenDecodeEntities': True,
'xmlSubstituteEntitiesDefault': True,
- 'xmlThrDefDefaultBufferSize': True,
'xmlThrDefDoValidityCheckingDefaultValue': True,
'xmlThrDefGetWarningsDefaultValue': True,
'xmlThrDefIndentTreeOutput': True,
'xmlThrDefKeepBlanksDefaultValue': True,
'xmlThrDefLineNumbersDefaultValue': True,
'xmlThrDefLoadExtDtdDefaultValue': True,
- 'xmlThrDefParserDebugEntities': True,
'xmlThrDefPedanticParserDefaultValue': True,
'xmlThrDefSaveNoEmptyTags': True,
'xmlThrDefSubstituteEntitiesDefaultValue': True,
diff --git a/testapi.c b/testapi.c
index 9f654291..4828da0c 100644
--- a/testapi.c
+++ b/testapi.c
@@ -15422,38 +15422,6 @@ test_xmlThrDefLoadExtDtdDefaultValue(void) {
}
-static int
-test_xmlThrDefParserDebugEntities(void) {
- int test_ret = 0;
-
- int mem_base;
- int ret_val;
- int v; /* */
- int n_v;
-
- for (n_v = 0;n_v < gen_nb_int;n_v++) {
- mem_base = xmlMemBlocks();
- v = gen_int(n_v, 0);
-
- ret_val = xmlThrDefParserDebugEntities(v);
- desret_int(ret_val);
- call_tests++;
- des_int(n_v, v, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlThrDefParserDebugEntities",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_v);
- printf("\n");
- }
- }
- function_tests++;
-
- return(test_ret);
-}
-
-
static int
test_xmlThrDefPedanticParserDefaultValue(void) {
int test_ret = 0;
@@ -15521,7 +15489,7 @@ static int
test_parser(void) {
int test_ret = 0;
- if (quiet == 0) printf("Testing parser : 89 of 105 functions ...\n");
+ if (quiet == 0) printf("Testing parser : 88 of 104 functions ...\n");
test_ret += test_xmlByteConsumed();
test_ret += test_xmlCleanupGlobals();
test_ret += test_xmlClearNodeInfoSeq();
@@ -15616,7 +15584,6 @@ test_parser(void) {
test_ret += test_xmlThrDefKeepBlanksDefaultValue();
test_ret += test_xmlThrDefLineNumbersDefaultValue();
test_ret += test_xmlThrDefLoadExtDtdDefaultValue();
- test_ret += test_xmlThrDefParserDebugEntities();
test_ret += test_xmlThrDefPedanticParserDefaultValue();
test_ret += test_xmlThrDefSubstituteEntitiesDefaultValue();
@@ -24055,70 +24022,6 @@ test_xmlTextMerge(void) {
}
-static int
-test_xmlThrDefBufferAllocScheme(void) {
- int test_ret = 0;
-
- int mem_base;
- xmlBufferAllocationScheme ret_val;
- xmlBufferAllocationScheme v; /* */
- int n_v;
-
- for (n_v = 0;n_v < gen_nb_xmlBufferAllocationScheme;n_v++) {
- mem_base = xmlMemBlocks();
- v = gen_xmlBufferAllocationScheme(n_v, 0);
-
- ret_val = xmlThrDefBufferAllocScheme(v);
- desret_xmlBufferAllocationScheme(ret_val);
- call_tests++;
- des_xmlBufferAllocationScheme(n_v, v, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlThrDefBufferAllocScheme",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_v);
- printf("\n");
- }
- }
- function_tests++;
-
- return(test_ret);
-}
-
-
-static int
-test_xmlThrDefDefaultBufferSize(void) {
- int test_ret = 0;
-
- int mem_base;
- int ret_val;
- int v; /* */
- int n_v;
-
- for (n_v = 0;n_v < gen_nb_int;n_v++) {
- mem_base = xmlMemBlocks();
- v = gen_int(n_v, 0);
-
- ret_val = xmlThrDefDefaultBufferSize(v);
- desret_int(ret_val);
- call_tests++;
- des_int(n_v, v, 0);
- xmlResetLastError();
- if (mem_base != xmlMemBlocks()) {
- printf("Leak of %d blocks found in xmlThrDefDefaultBufferSize",
- xmlMemBlocks() - mem_base);
- test_ret++;
- printf(" %d", n_v);
- printf("\n");
- }
- }
- function_tests++;
-
- return(test_ret);
-}
-
-
static int
test_xmlThrDefDeregisterNodeDefault(void) {
int test_ret = 0;
@@ -24383,7 +24286,7 @@ static int
test_tree(void) {
int test_ret = 0;
- if (quiet == 0) printf("Testing tree : 146 of 172 functions ...\n");
+ if (quiet == 0) printf("Testing tree : 144 of 170 functions ...\n");
test_ret += test_xmlAddChild();
test_ret += test_xmlAddChildList();
test_ret += test_xmlAddNextSibling();
@@ -24532,8 +24435,6 @@ test_tree(void) {
test_ret += test_xmlStringLenGetNodeList();
test_ret += test_xmlTextConcat();
test_ret += test_xmlTextMerge();
- test_ret += test_xmlThrDefBufferAllocScheme();
- test_ret += test_xmlThrDefDefaultBufferSize();
test_ret += test_xmlThrDefDeregisterNodeDefault();
test_ret += test_xmlThrDefRegisterNodeDefault();
test_ret += test_xmlUnsetNsProp();