1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-10-26 12:25:09 +03:00

Revert "catalog: Fetch XML catalog before dumping"

This reverts commit 723b4de040.
This commit is contained in:
Nick Wellnhofer 2024-08-19 20:44:07 +02:00
parent 57b92cabd2
commit 4b0078781b

View File

@ -60,6 +60,9 @@
#define XML_SGML_DEFAULT_CATALOG "file://" SYSCONFDIR "/sgml/catalog"
#endif
static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID);
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
/************************************************************************
* *
* Types, all private *
@ -174,21 +177,6 @@ static xmlRMutex xmlCatalogMutex;
*/
static int xmlCatalogInitialized = 0;
/************************************************************************
* *
* Forward declarations *
* *
************************************************************************/
static xmlChar *
xmlCatalogNormalizePublic(const xmlChar *pubID);
static int
xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
static int
xmlFetchXMLCatalogFile(xmlCatalogEntryPtr catal);
/************************************************************************
* *
* Catalog error handlers *
@ -547,9 +535,6 @@ static void xmlDumpXMLCatalogNode(xmlCatalogEntryPtr catal, xmlNodePtr catalog,
case XML_CATA_BROKEN_CATALOG:
case XML_CATA_CATALOG:
if (cur == catal) {
if (cur->children == NULL) {
xmlFetchXMLCatalogFile(cur);
}
cur = cur->children;
continue;
}