preparing for a 2.4.3 release even if it may not be ready yet redirected
* Makefile.am configure.in include/libxml/xmlwin32version.h:
preparing for a 2.4.3 release even if it may not be ready yet
* catalog.c parser.c xmlIO.c include/libxml/catalog.h: redirected
all file parsing lookup to go through the entity resolver, add
to add an API to bypass it (needed to load catalogs themselves),
some cleanup on the catalog code too.
* nanoftp.c: small cleanup
* doc/catalog.html: small update
Daniel
diff --git a/xmlIO.c b/xmlIO.c
index 72a56bf..9aca472 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -1595,6 +1595,9 @@
if (URI == NULL) return(NULL);
+#ifdef LIBXML_CATALOG_ENABLED
+#endif
+
/*
* Try to find one of the input accept method accepting taht scheme
* Go in reverse to give precedence to user defined handlers.
@@ -2373,7 +2376,9 @@
xmlParserInputPtr ret = NULL;
xmlChar *resource = NULL;
#ifdef LIBXML_CATALOG_ENABLED
+#ifdef HAVE_STAT
struct stat info;
+#endif
xmlCatalogAllow pref;
#endif
@@ -2413,7 +2418,7 @@
(const xmlChar *)URL);
}
if ((resource == NULL) && (URL != NULL))
- resource = xmlStrdup(URL);
+ resource = xmlStrdup((const xmlChar *) URL);
/*
* TODO: do an URI lookup on the reference
@@ -2431,8 +2436,8 @@
tmp = xmlCatalogLocalResolveURI(ctxt->catalogs, resource);
}
if ((tmp == NULL) &&
- (pref == XML_CATA_ALLOW_ALL) ||
- (pref == XML_CATA_ALLOW_GLOBAL)) {
+ ((pref == XML_CATA_ALLOW_ALL) ||
+ (pref == XML_CATA_ALLOW_GLOBAL))) {
tmp = xmlCatalogResolveURI(resource);
}
@@ -2501,7 +2506,7 @@
/**
* xmlLoadExternalEntity:
* @URL: the URL for the entity to load
- * @ID: the System ID for the entity to load
+ * @ID: the Public ID for the entity to load
* @ctxt: the context in which the entity is called or NULL
*
* Load an external entity, note that the use of this function for