[PHP4BETA] CVS update: php4/ext/xml
| From: | sas | Date: | Sat, 22 May 1999 16:12:09 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/xml | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-994@lists.php.net to get a copy of this message | ||
Date: Saturday May 22, 1999 @ 12:12
Author: sas
Update of /repository/php4/ext/xml
In directory php:/tmp/cvs-serv19009/ext/xml
Modified Files:
php3_xml.h xml.c
Log Message:
fix compile issues in LDAP/XML exts
Index: php4/ext/xml/php3_xml.h
diff -u php4/ext/xml/php3_xml.h:1.2 php4/ext/xml/php3_xml.h:1.3
--- php4/ext/xml/php3_xml.h:1.2 Fri May 21 06:06:24 1999
+++ php4/ext/xml/php3_xml.h Sat May 22 12:12:09 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id */
+/* $Id: php3_xml.h,v 1.3 1999/05/22 16:12:09 sas Exp $ */
#if HAVE_LIBEXPAT
# ifndef _PHP_XML_H
@@ -60,6 +60,17 @@
char *notationDeclHandler;
char *externalEntityRefHandler;
char *unknownEncodingHandler;
+
+ pval *data;
+ pval *info;
+ int level;
+ int toffset;
+ int curtag;
+ pval *ctag;
+ char **ltags;
+ int lastwasopen;
+ int skipwhite;
+
XML_Char *baseURI;
} xml_parser;
@@ -67,7 +78,7 @@
typedef struct {
XML_Char *name;
char (*decoding_function)(unsigned short);
- unsigned short (*encoding_function)(char);
+ unsigned short (*encoding_function)(unsigned char);
} xml_encoding;
@@ -75,14 +86,20 @@
# define xml_module_ptr &xml_module_entry
enum php3_xml_option {
- PHP3_XML_OPTION_CASE_FOLDING,
- PHP3_XML_OPTION_TARGET_ENCODING
+ PHP3_XML_OPTION_CASE_FOLDING = 1,
+ PHP3_XML_OPTION_TARGET_ENCODING,
+ PHP3_XML_OPTION_SKIP_TAGSTART,
+ PHP3_XML_OPTION_SKIP_WHITE
};
# define RETURN_OUT_OF_MEMORY \
php3_error(E_WARNING, "Out of memory");\
RETURN_FALSE
+/* for xml_parse_into_struct */
+
+#define XML_MAXLEVEL 255 /* XXX this should be dynamic */
+
PHP_FUNCTION(xml_parser_create);
PHP_FUNCTION(xml_set_element_handler);
PHP_FUNCTION(xml_set_character_data_handler);
@@ -102,6 +119,7 @@
PHP_FUNCTION(xml_parser_get_option);
PHP_FUNCTION(utf8_encode);
PHP_FUNCTION(utf8_decode);
+PHP_FUNCTION(xml_parse_into_struct);
#else /* !HAVE_LIBEXPAT */
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.3 php4/ext/xml/xml.c:1.4
--- php4/ext/xml/xml.c:1.3 Fri May 21 06:06:24 1999
+++ php4/ext/xml/xml.c Sat May 22 12:12:09 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.3 1999/05/21 10:06:24 sas Exp $ */
+/* $Id: xml.c,v 1.4 1999/05/22 16:12:09 sas Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
# if PHP_31
@@ -51,7 +51,6 @@
# endif
# include "snprintf.h"
# include "ext/standard/head.h"
-# include "php3_string.h"
/* Short-term TODO list:
* - Implement XML_ExternalEntityParserCreate()
--
PHP 4 Beta