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

Side by Side Diff: third_party/libxml/src/xinclude.c

Issue 2010803004: Roll libxml to bdec2183f34b37ee89ae1d330c6ad2bb4d76605f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update README.chromium Created 4 years, 6 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
« no previous file with comments | « third_party/libxml/src/win32/VC10/RuleSet1.ruleset ('k') | third_party/libxml/src/xmlIO.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * xinclude.c : Code to implement XInclude processing 2 * xinclude.c : Code to implement XInclude processing
3 * 3 *
4 * World Wide Web Consortium W3C Last Call Working Draft 10 November 2003 4 * World Wide Web Consortium W3C Last Call Working Draft 10 November 2003
5 * http://www.w3.org/TR/2003/WD-xinclude-20031110 5 * http://www.w3.org/TR/2003/WD-xinclude-20031110
6 * 6 *
7 * See Copyright for the status of this software. 7 * See Copyright for the status of this software.
8 * 8 *
9 * daniel@veillard.com 9 * daniel@veillard.com
10 */ 10 */
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 /** 119 /**
120 * xmlXIncludeErr: 120 * xmlXIncludeErr:
121 * @ctxt: the XInclude context 121 * @ctxt: the XInclude context
122 * @node: the context node 122 * @node: the context node
123 * @msg: the error message 123 * @msg: the error message
124 * @extra: extra information 124 * @extra: extra information
125 * 125 *
126 * Handle an XInclude error 126 * Handle an XInclude error
127 */ 127 */
128 static void 128 static void LIBXML_ATTR_FORMAT(4,0)
129 xmlXIncludeErr(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node, int error, 129 xmlXIncludeErr(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node, int error,
130 const char *msg, const xmlChar *extra) 130 const char *msg, const xmlChar *extra)
131 { 131 {
132 if (ctxt != NULL) 132 if (ctxt != NULL)
133 ctxt->nbErrors++; 133 ctxt->nbErrors++;
134 __xmlRaiseError(NULL, NULL, NULL, ctxt, node, XML_FROM_XINCLUDE, 134 __xmlRaiseError(NULL, NULL, NULL, ctxt, node, XML_FROM_XINCLUDE,
135 error, XML_ERR_ERROR, NULL, 0, 135 error, XML_ERR_ERROR, NULL, 0,
136 (const char *) extra, NULL, NULL, 0, 0, 136 (const char *) extra, NULL, NULL, 0, 0,
137 msg, (const char *) extra); 137 msg, (const char *) extra);
138 } 138 }
139 139
140 #if 0 140 #if 0
141 /** 141 /**
142 * xmlXIncludeWarn: 142 * xmlXIncludeWarn:
143 * @ctxt: the XInclude context 143 * @ctxt: the XInclude context
144 * @node: the context node 144 * @node: the context node
145 * @msg: the error message 145 * @msg: the error message
146 * @extra: extra information 146 * @extra: extra information
147 * 147 *
148 * Emit an XInclude warning. 148 * Emit an XInclude warning.
149 */ 149 */
150 static void 150 static void LIBXML_ATTR_FORMAT(4,0)
151 xmlXIncludeWarn(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node, int error, 151 xmlXIncludeWarn(xmlXIncludeCtxtPtr ctxt, xmlNodePtr node, int error,
152 const char *msg, const xmlChar *extra) 152 const char *msg, const xmlChar *extra)
153 { 153 {
154 __xmlRaiseError(NULL, NULL, NULL, ctxt, node, XML_FROM_XINCLUDE, 154 __xmlRaiseError(NULL, NULL, NULL, ctxt, node, XML_FROM_XINCLUDE,
155 error, XML_ERR_WARNING, NULL, 0, 155 error, XML_ERR_WARNING, NULL, 0,
156 (const char *) extra, NULL, NULL, 0, 0, 156 (const char *) extra, NULL, NULL, 0, 0,
157 msg, (const char *) extra); 157 msg, (const char *) extra);
158 } 158 }
159 #endif 159 #endif
160 160
(...skipping 2454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2615 ret = xmlXIncludeDoProcess(ctxt, node->doc, node); 2615 ret = xmlXIncludeDoProcess(ctxt, node->doc, node);
2616 if ((ret >= 0) && (ctxt->nbErrors > 0)) 2616 if ((ret >= 0) && (ctxt->nbErrors > 0))
2617 ret = -1; 2617 ret = -1;
2618 return(ret); 2618 return(ret);
2619 } 2619 }
2620 2620
2621 #else /* !LIBXML_XINCLUDE_ENABLED */ 2621 #else /* !LIBXML_XINCLUDE_ENABLED */
2622 #endif 2622 #endif
2623 #define bottom_xinclude 2623 #define bottom_xinclude
2624 #include "elfgcchack.h" 2624 #include "elfgcchack.h"
OLDNEW
« no previous file with comments | « third_party/libxml/src/win32/VC10/RuleSet1.ruleset ('k') | third_party/libxml/src/xmlIO.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698