From 4b0078781b9ec04cd681fc62788f4ce25b10c3b1 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Mon, 19 Aug 2024 20:44:07 +0200 Subject: [PATCH] Revert "catalog: Fetch XML catalog before dumping" This reverts commit 723b4de04015c5acccd3cda5dd60db7d00702064. --- catalog.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/catalog.c b/catalog.c index fea7c63a..521f218a 100644 --- a/catalog.c +++ b/catalog.c @@ -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; }