Export expat compat functions.

wez · wez · commit 06f448cf61b5 · 2003-12-19T16:57:36.000Z
"Implement" XML_GetCurrentByteCount(); probably not 100%
correct, but the only usage of it is by xmlrpc extension when
reporting an error; it should be safe.
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
@@ -377,13 +377,13 @@ php_xml_compat_handlers = {
 	1
 };
 
-XML_Parser 
+PHPAPI XML_Parser 
 XML_ParserCreate(const XML_Char *encoding)
 {
 	return XML_ParserCreate_MM(encoding, NULL, NULL);
 }
 
-XML_Parser
+PHPAPI XML_Parser
 XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)
 {
 	XML_Char tmp[2];
@@ -392,7 +392,7 @@ XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)
 	return XML_ParserCreate_MM(encoding, NULL, tmp);
 }
 
-XML_Parser
+PHPAPI XML_Parser
 XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, const XML_Char *sep)
 {
 	XML_Parser parser;
@@ -422,86 +422,86 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 	return parser;
 }
 
-void
+PHPAPI void
 XML_SetUserData(XML_Parser parser, void *user)
 {
 	parser->user = user;
 }
 
-void *
+PHPAPI void *
 XML_GetUserData(XML_Parser parser)
 {
 	return parser->user;
 }
 
-void
+PHPAPI void
 XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end)
 {
 	parser->h_start_element = start;
 	parser->h_end_element = end;
 }
 
-void
+PHPAPI void
 XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler cdata)
 {
 	parser->h_cdata = cdata;
 }
 
-void
+PHPAPI void
 XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler pi)
 {
 	parser->h_pi = pi;
 }
 
-void
+PHPAPI void
 XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler comment)
 {
 	parser->h_comment = comment;
 }
 
-void 
+PHPAPI void 
 XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler d)
 {
 	parser->h_default = d;
 }
 
-void
+PHPAPI void
 XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler unparsed_decl)
 {
 	parser->h_unparsed_entity_decl = unparsed_decl;
 }
 
-void
+PHPAPI void
 XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler notation_decl)
 {
 	parser->h_notation_decl = notation_decl;
 }
 
-void
+PHPAPI void
 XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler ext_entity)
 {
 	parser->h_external_entity_ref = ext_entity;
 }
 
-void
+PHPAPI void
 XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start_ns)
 {
 	parser->h_start_ns = start_ns;
 }
 
-void
+PHPAPI void
 XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end_ns)
 {
 	parser->h_end_ns = end_ns;
 }
 
-int
+PHPAPI int
 XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
 {
 	return !xmlParseChunk(parser->parser, data, data_len, is_final);
 }
 
-int
+PHPAPI int
 XML_GetErrorCode(XML_Parser parser)
 {
 	return parser->parser->errNo;
@@ -606,7 +606,7 @@ const XML_Char *error_mapping[] = {
     "XML_ERR_NO_DTD"
 };
 
-const XML_Char *
+PHPAPI const XML_Char *
 XML_ErrorString(int code)
 {
 	if (code < 0 || code >= (int)sizeof(error_mapping)) {
@@ -615,26 +615,35 @@ XML_ErrorString(int code)
 	return error_mapping[code];
 }
 
-int
+PHPAPI int
 XML_GetCurrentLineNumber(XML_Parser parser)
 {
 	return parser->parser->input->line;
 }
 
-int
+PHPAPI int
 XML_GetCurrentColumnNumber(XML_Parser parser)
 {
 	return parser->parser->input->col;
 }
 
-int
+PHPAPI int
 XML_GetCurrentByteIndex(XML_Parser parser)
 {
 	return parser->parser->input->consumed +
 			(parser->parser->input->cur - parser->parser->input->base);
 }
 
-const XML_Char *XML_ExpatVersion(void)
+PHPAPI int
+XML_GetCurrentByteCount(XML_Parser parser)
+{
+	/* WARNING: this is identical to ByteIndex; it should probably
+	 * be different */
+	return parser->parser->input->consumed +
+			(parser->parser->input->cur - parser->parser->input->base);
+}
+
+PHPAPI const XML_Char *XML_ExpatVersion(void)
 {
 	return "1.0";
 }
@@ -662,7 +671,7 @@ _free_ns_pointer(void *ptr, xmlChar *name)
 	efree(ptr);
 }
 
-void
+PHPAPI void
 XML_ParserFree(XML_Parser parser)
 {
 	if (parser->use_namespace) {
diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
@@ -113,28 +113,29 @@ enum XML_Content_Type {
 	XML_CTYPE_SEQ
 };
 
-XML_Parser XML_ParserCreate(const XML_Char *);
-XML_Parser XML_ParserCreateNS(const XML_Char *, const XML_Char);
-XML_Parser XML_ParserCreate_MM(const XML_Char *, const XML_Memory_Handling_Suite *, const XML_Char *);
-void XML_SetUserData(XML_Parser, void *);
-void *XML_GetUserData(XML_Parser);
-void XML_SetElementHandler(XML_Parser, XML_StartElementHandler, XML_EndElementHandler);
-void XML_SetCharacterDataHandler(XML_Parser, XML_CharacterDataHandler);
-void XML_SetProcessingInstructionHandler(XML_Parser, XML_ProcessingInstructionHandler);
-void XML_SetDefaultHandler(XML_Parser, XML_DefaultHandler);
-void XML_SetUnparsedEntityDeclHandler(XML_Parser, XML_UnparsedEntityDeclHandler);
-void XML_SetNotationDeclHandler(XML_Parser, XML_NotationDeclHandler);
-void XML_SetExternalEntityRefHandler(XML_Parser, XML_ExternalEntityRefHandler);
-void XML_SetStartNamespaceDeclHandler(XML_Parser, XML_StartNamespaceDeclHandler);
-void XML_SetEndNamespaceDeclHandler(XML_Parser, XML_EndNamespaceDeclHandler);
-int  XML_Parse(XML_Parser, const XML_Char *, int data_len, int is_final);
-int  XML_GetErrorCode(XML_Parser);
-const XML_Char *XML_ErrorString(int);
-int  XML_GetCurrentLineNumber(XML_Parser);
-int  XML_GetCurrentColumnNumber(XML_Parser);
-int  XML_GetCurrentByteIndex(XML_Parser);
-const XML_Char *XML_ExpatVersion(void);
-void XML_ParserFree(XML_Parser);
+PHPAPI XML_Parser XML_ParserCreate(const XML_Char *);
+PHPAPI XML_Parser XML_ParserCreateNS(const XML_Char *, const XML_Char);
+PHPAPI XML_Parser XML_ParserCreate_MM(const XML_Char *, const XML_Memory_Handling_Suite *, const XML_Char *);
+PHPAPI void XML_SetUserData(XML_Parser, void *);
+PHPAPI void *XML_GetUserData(XML_Parser);
+PHPAPI void XML_SetElementHandler(XML_Parser, XML_StartElementHandler, XML_EndElementHandler);
+PHPAPI void XML_SetCharacterDataHandler(XML_Parser, XML_CharacterDataHandler);
+PHPAPI void XML_SetProcessingInstructionHandler(XML_Parser, XML_ProcessingInstructionHandler);
+PHPAPI void XML_SetDefaultHandler(XML_Parser, XML_DefaultHandler);
+PHPAPI void XML_SetUnparsedEntityDeclHandler(XML_Parser, XML_UnparsedEntityDeclHandler);
+PHPAPI void XML_SetNotationDeclHandler(XML_Parser, XML_NotationDeclHandler);
+PHPAPI void XML_SetExternalEntityRefHandler(XML_Parser, XML_ExternalEntityRefHandler);
+PHPAPI void XML_SetStartNamespaceDeclHandler(XML_Parser, XML_StartNamespaceDeclHandler);
+PHPAPI void XML_SetEndNamespaceDeclHandler(XML_Parser, XML_EndNamespaceDeclHandler);
+PHPAPI int  XML_Parse(XML_Parser, const XML_Char *, int data_len, int is_final);
+PHPAPI int  XML_GetErrorCode(XML_Parser);
+PHPAPI const XML_Char *XML_ErrorString(int);
+PHPAPI int  XML_GetCurrentLineNumber(XML_Parser);
+PHPAPI int  XML_GetCurrentColumnNumber(XML_Parser);
+PHPAPI int  XML_GetCurrentByteIndex(XML_Parser);
+PHPAPI int  XML_GetCurrentByteCount(XML_Parser);
+PHPAPI const XML_Char *XML_ExpatVersion(void);
+PHPAPI void XML_ParserFree(XML_Parser);
 
 #elif defined(HAVE_LIBEXPAT)
 #include <expat.h>

Original file line number	Diff line number	Diff line change
`@@ -377,13 +377,13 @@ php_xml_compat_handlers = {`
`377`	`377`	`1`
`378`	`378`	`};`
`379`	`379`
`380`		`-XML_Parser`
	`380`	`+PHPAPI XML_Parser`
`381`	`381`	`XML_ParserCreate(const XML_Char *encoding)`
`382`	`382`	`{`
`383`	`383`	`return XML_ParserCreate_MM(encoding, NULL, NULL);`
`384`	`384`	`}`
`385`	`385`
`386`		`-XML_Parser`
	`386`	`+PHPAPI XML_Parser`
`387`	`387`	`XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)`
`388`	`388`	`{`
`389`	`389`	`XML_Char tmp[2];`
`@@ -392,7 +392,7 @@ XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)`
`392`	`392`	`return XML_ParserCreate_MM(encoding, NULL, tmp);`
`393`	`393`	`}`
`394`	`394`
`395`		`-XML_Parser`
	`395`	`+PHPAPI XML_Parser`
`396`	`396`	`XML_ParserCreate_MM(const XML_Char encoding, const XML_Memory_Handling_Suite memsuite, const XML_Char *sep)`
`397`	`397`	`{`
`398`	`398`	`XML_Parser parser;`
`@@ -422,86 +422,86 @@ XML_ParserCreate_MM(const XML_Char encoding, const XML_Memory_Handling_Suite m`
`422`	`422`	`return parser;`
`423`	`423`	`}`
`424`	`424`
`425`		`-void`
	`425`	`+PHPAPI void`
`426`	`426`	`XML_SetUserData(XML_Parser parser, void *user)`
`427`	`427`	`{`
`428`	`428`	`parser->user = user;`
`429`	`429`	`}`
`430`	`430`
`431`		`-void *`
	`431`	`+PHPAPI void *`
`432`	`432`	`XML_GetUserData(XML_Parser parser)`
`433`	`433`	`{`
`434`	`434`	`return parser->user;`
`435`	`435`	`}`
`436`	`436`
`437`		`-void`
	`437`	`+PHPAPI void`
`438`	`438`	`XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end)`
`439`	`439`	`{`
`440`	`440`	`parser->h_start_element = start;`
`441`	`441`	`parser->h_end_element = end;`
`442`	`442`	`}`
`443`	`443`
`444`		`-void`
	`444`	`+PHPAPI void`
`445`	`445`	`XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler cdata)`
`446`	`446`	`{`
`447`	`447`	`parser->h_cdata = cdata;`
`448`	`448`	`}`
`449`	`449`
`450`		`-void`
	`450`	`+PHPAPI void`
`451`	`451`	`XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler pi)`
`452`	`452`	`{`
`453`	`453`	`parser->h_pi = pi;`
`454`	`454`	`}`
`455`	`455`
`456`		`-void`
	`456`	`+PHPAPI void`
`457`	`457`	`XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler comment)`
`458`	`458`	`{`
`459`	`459`	`parser->h_comment = comment;`
`460`	`460`	`}`
`461`	`461`
`462`		`-void`
	`462`	`+PHPAPI void`
`463`	`463`	`XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler d)`
`464`	`464`	`{`
`465`	`465`	`parser->h_default = d;`
`466`	`466`	`}`
`467`	`467`
`468`		`-void`
	`468`	`+PHPAPI void`
`469`	`469`	`XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler unparsed_decl)`
`470`	`470`	`{`
`471`	`471`	`parser->h_unparsed_entity_decl = unparsed_decl;`
`472`	`472`	`}`
`473`	`473`
`474`		`-void`
	`474`	`+PHPAPI void`
`475`	`475`	`XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler notation_decl)`
`476`	`476`	`{`
`477`	`477`	`parser->h_notation_decl = notation_decl;`
`478`	`478`	`}`
`479`	`479`
`480`		`-void`
	`480`	`+PHPAPI void`
`481`	`481`	`XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler ext_entity)`
`482`	`482`	`{`
`483`	`483`	`parser->h_external_entity_ref = ext_entity;`
`484`	`484`	`}`
`485`	`485`
`486`		`-void`
	`486`	`+PHPAPI void`
`487`	`487`	`XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start_ns)`
`488`	`488`	`{`
`489`	`489`	`parser->h_start_ns = start_ns;`
`490`	`490`	`}`
`491`	`491`
`492`		`-void`
	`492`	`+PHPAPI void`
`493`	`493`	`XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end_ns)`
`494`	`494`	`{`
`495`	`495`	`parser->h_end_ns = end_ns;`
`496`	`496`	`}`
`497`	`497`
`498`		`-int`
	`498`	`+PHPAPI int`
`499`	`499`	`XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)`
`500`	`500`	`{`
`501`	`501`	`return !xmlParseChunk(parser->parser, data, data_len, is_final);`
`502`	`502`	`}`
`503`	`503`
`504`		`-int`
	`504`	`+PHPAPI int`
`505`	`505`	`XML_GetErrorCode(XML_Parser parser)`
`506`	`506`	`{`
`507`	`507`	`return parser->parser->errNo;`
`@@ -606,7 +606,7 @@ const XML_Char *error_mapping[] = {`
`606`	`606`	`"XML_ERR_NO_DTD"`
`607`	`607`	`};`
`608`	`608`
`609`		`-const XML_Char *`
	`609`	`+PHPAPI const XML_Char *`
`610`	`610`	`XML_ErrorString(int code)`
`611`	`611`	`{`
`612`	`612`	`if (code < 0 \|\| code >= (int)sizeof(error_mapping)) {`
`@@ -615,26 +615,35 @@ XML_ErrorString(int code)`
`615`	`615`	`return error_mapping[code];`
`616`	`616`	`}`
`617`	`617`
`618`		`-int`
	`618`	`+PHPAPI int`
`619`	`619`	`XML_GetCurrentLineNumber(XML_Parser parser)`
`620`	`620`	`{`
`621`	`621`	`return parser->parser->input->line;`
`622`	`622`	`}`
`623`	`623`
`624`		`-int`
	`624`	`+PHPAPI int`
`625`	`625`	`XML_GetCurrentColumnNumber(XML_Parser parser)`
`626`	`626`	`{`
`627`	`627`	`return parser->parser->input->col;`
`628`	`628`	`}`
`629`	`629`
`630`		`-int`
	`630`	`+PHPAPI int`
`631`	`631`	`XML_GetCurrentByteIndex(XML_Parser parser)`
`632`	`632`	`{`
`633`	`633`	`return parser->parser->input->consumed +`
`634`	`634`	`(parser->parser->input->cur - parser->parser->input->base);`
`635`	`635`	`}`
`636`	`636`
`637`		`-const XML_Char *XML_ExpatVersion(void)`
	`637`	`+PHPAPI int`
	`638`	`+XML_GetCurrentByteCount(XML_Parser parser)`
	`639`	`+{`
	`640`	`+ /* WARNING: this is identical to ByteIndex; it should probably`
	`641`	`+ * be different */`
	`642`	`+ return parser->parser->input->consumed +`
	`643`	`+ (parser->parser->input->cur - parser->parser->input->base);`
	`644`	`+}`
	`645`	`+`
	`646`	`+PHPAPI const XML_Char *XML_ExpatVersion(void)`
`638`	`647`	`{`
`639`	`648`	`return "1.0";`
`640`	`649`	`}`
`@@ -662,7 +671,7 @@ _free_ns_pointer(void ptr, xmlChar name)`
`662`	`671`	`efree(ptr);`
`663`	`672`	`}`
`664`	`673`
`665`		`-void`
	`674`	`+PHPAPI void`
`666`	`675`	`XML_ParserFree(XML_Parser parser)`
`667`	`676`	`{`
`668`	`677`	`if (parser->use_namespace) {`