aboutsummaryrefslogtreecommitdiffstats
path: root/include/libxml
diff options
context:
space:
mode:
Diffstat (limited to 'include/libxml')
-rw-r--r--include/libxml/HTMLparser.h2
-rw-r--r--include/libxml/HTMLtree.h2
-rw-r--r--include/libxml/SAX.h4
-rw-r--r--include/libxml/debugXML.h9
-rw-r--r--include/libxml/encoding.h1
-rw-r--r--include/libxml/entities.h2
-rw-r--r--include/libxml/nanoftp.h5
-rw-r--r--include/libxml/nanohttp.h6
-rw-r--r--include/libxml/parser.h8
-rw-r--r--include/libxml/parserInternals.h2
-rw-r--r--include/libxml/tree.h1
-rw-r--r--include/libxml/uri.h11
-rw-r--r--include/libxml/valid.h2
-rw-r--r--include/libxml/xlink.h2
-rw-r--r--include/libxml/xmlIO.h6
-rw-r--r--include/libxml/xmlmemory.h1
-rw-r--r--include/libxml/xpath.h2
17 files changed, 46 insertions, 20 deletions
diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h
index 22fe6147..44d9c271 100644
--- a/include/libxml/HTMLparser.h
+++ b/include/libxml/HTMLparser.h
@@ -8,7 +8,7 @@
#ifndef __HTML_PARSER_H__
#define __HTML_PARSER_H__
-#include "parser.h"
+#include <libxml/parser.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/HTMLtree.h b/include/libxml/HTMLtree.h
index 2b375e56..9378ba4c 100644
--- a/include/libxml/HTMLtree.h
+++ b/include/libxml/HTMLtree.h
@@ -11,7 +11,7 @@
#define __HTML_TREE_H__
#include <stdio.h>
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index bbd0f96f..a3bd1025 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -12,8 +12,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include "parser.h"
-#include "xlink.h"
+#include <libxml/parser.h>
+#include <libxml/xlink.h>
#ifdef __cplusplus
#define extern "C" {
diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h
index 5d4d2ae1..31384690 100644
--- a/include/libxml/debugXML.h
+++ b/include/libxml/debugXML.h
@@ -8,8 +8,11 @@
#ifndef __DEBUG_XML__
#define __DEBUG_XML__
#include <stdio.h>
-#include "tree.h"
-#include "xpath.h"
+#include <libxml/tree.h>
+
+#ifdef LIBXML_DEBUG_ENABLED
+
+#include <libxml/xpath.h>
#ifdef __cplusplus
extern "C" {
@@ -103,4 +106,6 @@ void xmlShell (xmlDocPtr doc,
#ifdef __cplusplus
}
#endif
+
+#endif /* LIBXML_DEBUG_ENABLED */
#endif /* __DEBUG_XML__ */
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index 12a79108..1b1c92e3 100644
--- a/include/libxml/encoding.h
+++ b/include/libxml/encoding.h
@@ -21,6 +21,7 @@
#ifndef __XML_CHAR_ENCODING_H__
#define __XML_CHAR_ENCODING_H__
+#include <libxml/xmlversion.h>
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 50e1f51d..f0ec7314 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -9,7 +9,7 @@
#ifndef __XML_ENTITIES_H__
#define __XML_ENTITIES_H__
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/nanoftp.h b/include/libxml/nanoftp.h
index 0a41b975..53465280 100644
--- a/include/libxml/nanoftp.h
+++ b/include/libxml/nanoftp.h
@@ -8,6 +8,10 @@
#ifndef __NANO_FTP_H__
#define __NANO_FTP_H__
+
+#include <libxml/xmlversion.h>
+#ifdef LIBXML_FTP_ENABLED
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -101,5 +105,6 @@ int xmlNanoFTPRead (void *ctx,
#ifdef __cplusplus
}
+#endif /* LIBXML_FTP_ENABLED */
#endif
#endif /* __NANO_FTP_H__ */
diff --git a/include/libxml/nanohttp.h b/include/libxml/nanohttp.h
index 7e0e2cec..49f7645c 100644
--- a/include/libxml/nanohttp.h
+++ b/include/libxml/nanohttp.h
@@ -8,6 +8,10 @@
#ifndef __NANO_HTTP_H__
#define __NANO_HTTP_H__
+
+#include <libxml/xmlversion.h>
+#ifdef LIBXML_HTTP_ENABLED
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -33,5 +37,7 @@ int xmlNanoHTTPSave (void *ctxt,
void xmlNanoHTTPClose (void *ctx);
#ifdef __cplusplus
}
+
+#endif /* LIBXML_HTTP_ENABLED */
#endif
#endif /* __NANO_HTTP_H__ */
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 54f00e65..d755b70b 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -9,10 +9,10 @@
#ifndef __XML_PARSER_H__
#define __XML_PARSER_H__
-#include "tree.h"
-#include "valid.h"
-#include "xmlIO.h"
-#include "entities.h"
+#include <libxml/tree.h>
+#include <libxml/valid.h>
+#include <libxml/xmlIO.h>
+#include <libxml/entities.h>
#ifdef __cplusplus
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index db7965a6..b29f11c3 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -9,7 +9,7 @@
#ifndef __XML_PARSER_INTERNALS_H__
#define __XML_PARSER_INTERNALS_H__
-#include "parser.h"
+#include <libxml/parser.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index c881728b..a7559629 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -11,6 +11,7 @@
#define __XML_TREE_H__
#include <stdio.h>
+#include <libxml/xmlversion.h>
#ifdef __cplusplus
diff --git a/include/libxml/uri.h b/include/libxml/uri.h
index b8b39959..f54754a7 100644
--- a/include/libxml/uri.h
+++ b/include/libxml/uri.h
@@ -11,7 +11,7 @@
#ifndef __XML_URI_H__
#define __XML_URI_H__
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
@@ -24,10 +24,11 @@ typedef struct _xmlURI xmlURI;
typedef xmlURI *xmlURIPtr;
struct _xmlURI {
char *scheme;
+ char *opaque;
char *authority;
char *server;
+ char *user;
int port;
- char *opaque;
char *path;
char *query;
char *fragment;
@@ -42,7 +43,13 @@ xmlChar * xmlBuildURI (const xmlChar *URI,
const xmlChar *base);
xmlURIPtr xmlParseURI (const char *URI);
xmlChar * xmlSaveUri (xmlURIPtr uri);
+void xmlPrintURI (FILE *stream,
+ xmlURIPtr uri);
+char * xmlURIUnescapeString (const char *str,
+ int len,
+ char *target);
int xmlNormalizeURIPath (char *path);
+void xmlFreeURI (xmlURIPtr uri);
#ifdef __cplusplus
}
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index d211207e..ef659079 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -10,7 +10,7 @@
#ifndef __XML_VALID_H__
#define __XML_VALID_H__
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h
index 0bcceeb8..68a35fee 100644
--- a/include/libxml/xlink.h
+++ b/include/libxml/xlink.h
@@ -13,7 +13,7 @@
#ifndef __XML_XLINK_H__
#define __XML_XLINK_H__
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
#define extern "C" {
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index 565c21c1..4d63b826 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -10,9 +10,9 @@
#define __XML_IO_H__
#include <stdio.h>
-#include "tree.h"
-#include "parser.h"
-#include "encoding.h"
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/encoding.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h
index 43a92b01..02378205 100644
--- a/include/libxml/xmlmemory.h
+++ b/include/libxml/xmlmemory.h
@@ -9,6 +9,7 @@
#define _DEBUG_MEMORY_ALLOC_
#include <stdio.h>
+#include <libxml/xmlversion.h>
/*
* DEBUG_MEMORY_LOCATION should be activated only done when debugging
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index c0222e6e..73e3f659 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -12,7 +12,7 @@
#ifndef __XML_XPATH_H__
#define __XML_XPATH_H__
-#include "tree.h"
+#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 04:09:30 +0000