Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: third_party/libxml/catalog.c

Issue 2951008: Update libxml to 2.7.7. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /** 1 /**
2 * catalog.c: set of generic Catalog related routines 2 * catalog.c: set of generic Catalog related routines
3 * 3 *
4 * Reference: SGML Open Technical Resolution TR9401:1997. 4 * Reference: SGML Open Technical Resolution TR9401:1997.
5 * http://www.jclark.com/sp/catalog.htm 5 * http://www.jclark.com/sp/catalog.htm
6 * 6 *
7 * XML Catalogs Working Draft 06 August 2001 7 * XML Catalogs Working Draft 06 August 2001
8 * http://www.oasis-open.org/committees/entity/spec-2001-08-06.html 8 * http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
9 * 9 *
10 * See Copyright for the status of this software. 10 * See Copyright for the status of this software.
(...skipping 2598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2609 2609
2610 if (catal->sgml == NULL) 2610 if (catal->sgml == NULL)
2611 return(NULL); 2611 return(NULL);
2612 2612
2613 if (pubID != NULL) 2613 if (pubID != NULL)
2614 ret = xmlCatalogGetSGMLPublic(catal->sgml, pubID); 2614 ret = xmlCatalogGetSGMLPublic(catal->sgml, pubID);
2615 if (ret != NULL) 2615 if (ret != NULL)
2616 return(ret); 2616 return(ret);
2617 if (sysID != NULL) 2617 if (sysID != NULL)
2618 ret = xmlCatalogGetSGMLSystem(catal->sgml, sysID); 2618 ret = xmlCatalogGetSGMLSystem(catal->sgml, sysID);
2619 if (ret != NULL)
2620 return(ret);
2619 return(NULL); 2621 return(NULL);
2620 } 2622 }
2621 2623
2622 /************************************************************************ 2624 /************************************************************************
2623 * * 2625 * *
2624 * Specific Public interfaces * 2626 * Specific Public interfaces *
2625 * * 2627 * *
2626 ************************************************************************/ 2628 ************************************************************************/
2627 2629
2628 /** 2630 /**
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
2905 2907
2906 if (catal->type == XML_XML_CATALOG_TYPE) { 2908 if (catal->type == XML_XML_CATALOG_TYPE) {
2907 ret = xmlCatalogListXMLResolveURI(catal->xml, URI); 2909 ret = xmlCatalogListXMLResolveURI(catal->xml, URI);
2908 if (ret == XML_CATAL_BREAK) 2910 if (ret == XML_CATAL_BREAK)
2909 ret = NULL; 2911 ret = NULL;
2910 } else { 2912 } else {
2911 const xmlChar *sgml; 2913 const xmlChar *sgml;
2912 2914
2913 sgml = xmlCatalogSGMLResolve(catal, NULL, URI); 2915 sgml = xmlCatalogSGMLResolve(catal, NULL, URI);
2914 if (sgml != NULL) 2916 if (sgml != NULL)
2915 sgml = xmlStrdup(sgml); 2917 ret = xmlStrdup(sgml);
2916 } 2918 }
2917 return(ret); 2919 return(ret);
2918 } 2920 }
2919 2921
2920 #ifdef LIBXML_OUTPUT_ENABLED 2922 #ifdef LIBXML_OUTPUT_ENABLED
2921 /** 2923 /**
2922 * xmlACatalogDump: 2924 * xmlACatalogDump:
2923 * @catal: a Catalog 2925 * @catal: a Catalog
2924 * @out: the file. 2926 * @out: the file.
2925 * 2927 *
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
3813 } 3815 }
3814 3816
3815 if (xmlDefaultCatalog != NULL) 3817 if (xmlDefaultCatalog != NULL)
3816 return(xmlCatalogGetSGMLPublic(xmlDefaultCatalog->sgml, pubID)); 3818 return(xmlCatalogGetSGMLPublic(xmlDefaultCatalog->sgml, pubID));
3817 return(NULL); 3819 return(NULL);
3818 } 3820 }
3819 3821
3820 #define bottom_catalog 3822 #define bottom_catalog
3821 #include "elfgcchack.h" 3823 #include "elfgcchack.h"
3822 #endif /* LIBXML_CATALOG_ENABLED */ 3824 #endif /* LIBXML_CATALOG_ENABLED */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698