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

Side by Side Diff: third_party/libxml/src/xmlreader.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/xmlmemory.c ('k') | third_party/libxml/src/xmlregexp.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 * xmlreader.c: implements the xmlTextReader streaming node API 2 * xmlreader.c: implements the xmlTextReader streaming node API
3 * 3 *
4 * NOTE: 4 * NOTE:
5 * XmlTextReader.Normalization Property won't be supported, since 5 * XmlTextReader.Normalization Property won't be supported, since
6 * it makes the parser non compliant to the XML recommendation 6 * it makes the parser non compliant to the XML recommendation
7 * 7 *
8 * See Copyright for the status of this software. 8 * See Copyright for the status of this software.
9 * 9 *
10 * daniel@veillard.com 10 * daniel@veillard.com
(...skipping 4032 matching lines...) Expand 10 before | Expand all | Expand 10 after
4043 if (reader->doc != NULL) 4043 if (reader->doc != NULL)
4044 return(reader->doc); 4044 return(reader->doc);
4045 if ((reader->ctxt == NULL) || (reader->ctxt->myDoc == NULL)) 4045 if ((reader->ctxt == NULL) || (reader->ctxt->myDoc == NULL))
4046 return(NULL); 4046 return(NULL);
4047 4047
4048 reader->preserve = 1; 4048 reader->preserve = 1;
4049 return(reader->ctxt->myDoc); 4049 return(reader->ctxt->myDoc);
4050 } 4050 }
4051 4051
4052 #ifdef LIBXML_SCHEMAS_ENABLED 4052 #ifdef LIBXML_SCHEMAS_ENABLED
4053 static char *xmlTextReaderBuildMessage(const char *msg, va_list ap); 4053 static char *xmlTextReaderBuildMessage(const char *msg, va_list ap) LIBXML_ATTR_ FORMAT(1,0);
4054 4054
4055 static void XMLCDECL 4055 static void XMLCDECL
4056 xmlTextReaderValidityError(void *ctxt, const char *msg, ...); 4056 xmlTextReaderValidityError(void *ctxt, const char *msg, ...) LIBXML_ATTR_FORMAT( 2,3);
4057 4057
4058 static void XMLCDECL 4058 static void XMLCDECL
4059 xmlTextReaderValidityWarning(void *ctxt, const char *msg, ...); 4059 xmlTextReaderValidityWarning(void *ctxt, const char *msg, ...) LIBXML_ATTR_FORMA T(2,3);
4060
4061 static void XMLCDECL
4062 xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...) LIBXML_ATTR_FOR MAT(2,3);
4063
4064 static void XMLCDECL
4065 xmlTextReaderValidityWarningRelay(void *ctx, const char *msg, ...) LIBXML_ATTR_F ORMAT(2,3);
4060 4066
4061 static void XMLCDECL 4067 static void XMLCDECL
4062 xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...) 4068 xmlTextReaderValidityErrorRelay(void *ctx, const char *msg, ...)
4063 { 4069 {
4064 xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx; 4070 xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx;
4065 4071
4066 char *str; 4072 char *str;
4067 4073
4068 va_list ap; 4074 va_list ap;
4069 4075
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
4843 { 4849 {
4844 xmlParserCtxtPtr ctx = (xmlParserCtxtPtr) ctxt; 4850 xmlParserCtxtPtr ctx = (xmlParserCtxtPtr) ctxt;
4845 4851
4846 xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx->_private; 4852 xmlTextReaderPtr reader = (xmlTextReaderPtr) ctx->_private;
4847 4853
4848 if (error && reader->sErrorFunc) { 4854 if (error && reader->sErrorFunc) {
4849 reader->sErrorFunc(reader->errorFuncArg, (xmlErrorPtr) error); 4855 reader->sErrorFunc(reader->errorFuncArg, (xmlErrorPtr) error);
4850 } 4856 }
4851 } 4857 }
4852 4858
4853 static void XMLCDECL 4859 static void XMLCDECL LIBXML_ATTR_FORMAT(2,3)
4854 xmlTextReaderError(void *ctxt, const char *msg, ...) 4860 xmlTextReaderError(void *ctxt, const char *msg, ...)
4855 { 4861 {
4856 va_list ap; 4862 va_list ap;
4857 4863
4858 va_start(ap, msg); 4864 va_start(ap, msg);
4859 xmlTextReaderGenericError(ctxt, 4865 xmlTextReaderGenericError(ctxt,
4860 XML_PARSER_SEVERITY_ERROR, 4866 XML_PARSER_SEVERITY_ERROR,
4861 xmlTextReaderBuildMessage(msg, ap)); 4867 xmlTextReaderBuildMessage(msg, ap));
4862 va_end(ap); 4868 va_end(ap);
4863 4869
4864 } 4870 }
4865 4871
4866 static void XMLCDECL 4872 static void XMLCDECL LIBXML_ATTR_FORMAT(2,3)
4867 xmlTextReaderWarning(void *ctxt, const char *msg, ...) 4873 xmlTextReaderWarning(void *ctxt, const char *msg, ...)
4868 { 4874 {
4869 va_list ap; 4875 va_list ap;
4870 4876
4871 va_start(ap, msg); 4877 va_start(ap, msg);
4872 xmlTextReaderGenericError(ctxt, 4878 xmlTextReaderGenericError(ctxt,
4873 XML_PARSER_SEVERITY_WARNING, 4879 XML_PARSER_SEVERITY_WARNING,
4874 xmlTextReaderBuildMessage(msg, ap)); 4880 xmlTextReaderBuildMessage(msg, ap));
4875 va_end(ap); 4881 va_end(ap);
4876 } 4882 }
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
5941 printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons, 5947 printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons,
5942 prod, output3); 5948 prod, output3);
5943 return (0); 5949 return (0);
5944 5950
5945 } 5951 }
5946 #endif 5952 #endif
5947 #endif /* NOT_USED_YET */ 5953 #endif /* NOT_USED_YET */
5948 #define bottom_xmlreader 5954 #define bottom_xmlreader
5949 #include "elfgcchack.h" 5955 #include "elfgcchack.h"
5950 #endif /* LIBXML_READER_ENABLED */ 5956 #endif /* LIBXML_READER_ENABLED */
OLDNEW
« no previous file with comments | « third_party/libxml/src/xmlmemory.c ('k') | third_party/libxml/src/xmlregexp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698