summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libxml/catalog.h1
-rw-r--r--include/libxml/debugXML.h3
-rw-r--r--include/libxml/nanoftp.h6
-rw-r--r--include/libxml/relaxng.h8
-rw-r--r--include/libxml/valid.h17
-rw-r--r--include/libxml/xmlerror.h3
-rw-r--r--include/libxml/xmlmemory.h2
-rw-r--r--include/libxml/xmlstring.h2
-rw-r--r--include/libxml/xmlversion.h10
-rw-r--r--include/libxml/xpath.h3
-rw-r--r--include/libxml/xpathInternals.h3
11 files changed, 43 insertions, 15 deletions
diff --git a/include/libxml/catalog.h b/include/libxml/catalog.h
index 2996330..b444137 100644
--- a/include/libxml/catalog.h
+++ b/include/libxml/catalog.h
@@ -21,6 +21,7 @@
#include <libxml/xmlversion.h>
#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
#ifdef LIBXML_CATALOG_ENABLED
diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h
index d3b123c..733ccd4 100644
--- a/include/libxml/debugXML.h
+++ b/include/libxml/debugXML.h
@@ -91,6 +91,7 @@ XMLPUBFUN const char * XMLCALL
* *
****************************************************************/
+#ifdef LIBXML_XPATH_ENABLED
/**
* xmlShellReadlineFunc:
* @prompt: a string prompt
@@ -204,6 +205,8 @@ XMLPUBFUN void XMLCALL
xmlShellReadlineFunc input,
FILE *output);
+#endif /* LIBXML_XPATH_ENABLED */
+
#ifdef __cplusplus
}
#endif
diff --git a/include/libxml/nanoftp.h b/include/libxml/nanoftp.h
index 95280db..e3c28a0 100644
--- a/include/libxml/nanoftp.h
+++ b/include/libxml/nanoftp.h
@@ -109,10 +109,10 @@ XMLPUBFUN int XMLCALL
*/
XMLPUBFUN int XMLCALL
xmlNanoFTPCwd (void *ctx,
- char *directory);
+ const char *directory);
XMLPUBFUN int XMLCALL
xmlNanoFTPDele (void *ctx,
- char *file);
+ const char *file);
XMLPUBFUN int XMLCALL
xmlNanoFTPGetConnection (void *ctx);
@@ -122,7 +122,7 @@ XMLPUBFUN int XMLCALL
xmlNanoFTPList (void *ctx,
ftpListCallback callback,
void *userData,
- char *filename);
+ const char *filename);
XMLPUBFUN int XMLCALL
xmlNanoFTPGetSocket (void *ctx,
const char *filename);
diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h
index 3254400..ca3c13b 100644
--- a/include/libxml/relaxng.h
+++ b/include/libxml/relaxng.h
@@ -94,6 +94,12 @@ typedef enum {
XML_RELAXNGP_FREE_DOC = 1,
XML_RELAXNGP_CRNG = 2
} xmlRelaxNGParserFlag;
+
+XMLPUBFUN int XMLCALL
+ xmlRelaxNGInitTypes (void);
+XMLPUBFUN void XMLCALL
+ xmlRelaxNGCleanupTypes (void);
+
/*
* Interfaces for parsing.
*/
@@ -153,8 +159,6 @@ XMLPUBFUN void XMLCALL
XMLPUBFUN int XMLCALL
xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt,
xmlDocPtr doc);
-XMLPUBFUN void XMLCALL
- xmlRelaxNGCleanupTypes (void);
/*
* Interfaces for progressive validation when possible
*/
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index a734902..99777d1 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -58,6 +58,21 @@ typedef void (*xmlValidityWarningFunc) (void *ctx,
const char *msg,
...);
+#ifdef IN_LIBXML
+/**
+ * XML_CTXT_FINISH_DTD_0:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_0 0xabcd1234
+/**
+ * XML_CTXT_FINISH_DTD_1:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_1 0xabcd1235
+#endif
+
/*
* xmlValidCtxt:
* An xmlValidCtxt is used for error reporting when validating.
@@ -75,7 +90,7 @@ struct _xmlValidCtxt {
int nodeMax; /* Max depth of the parsing stack */
xmlNodePtr *nodeTab; /* array of nodes */
- int finishDtd; /* finished validating the Dtd ? */
+ unsigned int finishDtd; /* finished validating the Dtd ? */
xmlDocPtr doc; /* the document */
int valid; /* temporary validity check result */
diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
index d893369..29fe748 100644
--- a/include/libxml/xmlerror.h
+++ b/include/libxml/xmlerror.h
@@ -58,7 +58,8 @@ typedef enum {
XML_FROM_C14N, /* The Canonicalization module */
XML_FROM_XSLT, /* The XSLT engine from libxslt */
XML_FROM_VALID, /* The XML DTD validation with valid context */
- XML_FROM_CHECK /* The error checking module */
+ XML_FROM_CHECK, /* The error checking module */
+ XML_FROM_WRITER /* The xmlwriter module */
} xmlErrorDomain;
/**
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index 0e6a767..235721c 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -139,6 +139,8 @@ XMLPUBFUN void XMLCALL
*/
XMLPUBFUN int XMLCALL
xmlMemUsed (void);
+XMLPUBFUN int XMLCALL
+ xmlMemBlocks (void);
XMLPUBFUN void XMLCALL
xmlMemDisplay (FILE *fp);
XMLPUBFUN void XMLCALL
diff --git a/include/libxml/xmlstring.h b/include/libxml/xmlstring.h
index 74ae405..39f846e 100644
--- a/include/libxml/xmlstring.h
+++ b/include/libxml/xmlstring.h
@@ -117,7 +117,7 @@ XMLPUBFUN int XMLCALL
XMLPUBFUN xmlChar * XMLCALL
xmlUTF8Strndup (const xmlChar *utf,
int len);
-XMLPUBFUN xmlChar * XMLCALL
+XMLPUBFUN const xmlChar * XMLCALL
xmlUTF8Strpos (const xmlChar *utf,
int pos);
XMLPUBFUN int XMLCALL
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index 5939cba..5814bf9 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* the version string like "1.2.3"
*/
-#define LIBXML_DOTTED_VERSION "2.6.15"
+#define LIBXML_DOTTED_VERSION "2.6.16"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXML_VERSION 20615
+#define LIBXML_VERSION 20616
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXML_VERSION_STRING "20615"
+#define LIBXML_VERSION_STRING "20616"
/**
* LIBXML_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXML_VERSION_EXTRA "-CVS2214"
+#define LIBXML_VERSION_EXTRA "-CVS2257"
/**
* LIBXML_TEST_VERSION:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
-#define LIBXML_TEST_VERSION xmlCheckVersion(20615);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20616);
#ifndef VMS
#if 0
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 20426e7..19a2354 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -62,7 +62,8 @@ typedef enum {
XPTR_SUB_RESOURCE_ERROR,
XPATH_UNDEF_PREFIX_ERROR,
XPATH_ENCODING_ERROR,
- XPATH_INVALID_CHAR_ERROR
+ XPATH_INVALID_CHAR_ERROR,
+ XPATH_INVALID_CTXT
} xmlXPathError;
/*
diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h
index 88ee27c..dcd5243 100644
--- a/include/libxml/xpathInternals.h
+++ b/include/libxml/xpathInternals.h
@@ -40,7 +40,7 @@ extern "C" {
*/
#define xmlXPathSetError(ctxt, err) \
{ xmlXPatherror((ctxt), __FILE__, __LINE__, (err)); \
- (ctxt)->error = (err); }
+ if ((ctxt) != NULL) (ctxt)->error = (err); }
/**
* xmlXPathSetArityError:
@@ -294,6 +294,7 @@ XMLPUBFUN void * XMLCALL
* Macro to check that the number of args passed to an XPath function matches.
*/
#define CHECK_ARITY(x) \
+ if (ctxt == NULL) return; \
if (nargs != (x)) \
XP_ERROR(XPATH_INVALID_ARITY);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 08:07:07 +0000