CVS update: php3/functions
| From: | ssb | Date: | Fri, 23 Oct 1998 11:18:24 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1983@lists.php.net to get a copy of this message | ||
Date: Friday October 23, 1998 @ 7:18
Author: ssb
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv9396/functions
Modified Files:
xml.c php3_xml.h
Log Message:
Zeev wins :-)
Index: php3/functions/xml.c
diff -c php3/functions/xml.c:1.5 php3/functions/xml.c:1.6
*** php3/functions/xml.c:1.5 Wed Oct 21 13:32:42 1998
--- php3/functions/xml.c Fri Oct 23 07:18:22 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: xml.c,v 1.5 1998/10/21 17:32:42 ssb Exp $ */
#include "php.h"
#include "internal_functions.h"
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: xml.c,v 1.6 1998/10/23 11:18:22 ssb Exp $ */
#include "php.h"
#include "internal_functions.h"
***************
*** 146,168 ****
/* {{{ extension definition structures */
function_entry xml_functions[] = {
! PHP_FE(xml_parsercreate, NULL)
! PHP_FE(xml_setelementhandler, NULL)
! PHP_FE(xml_setcharacterdatahandler, NULL)
! PHP_FE(xml_setprocessinginstructionhandler, NULL)
! PHP_FE(xml_setdefaulthandler, NULL)
! PHP_FE(xml_setunparsedentitydeclhandler, NULL)
! PHP_FE(xml_setnotationdeclhandler, NULL)
! PHP_FE(xml_setexternalentityrefhandler, NULL)
PHP_FE(xml_parse, NULL)
! PHP_FE(xml_geterrorcode, NULL)
! PHP_FE(xml_errorstring, NULL)
! PHP_FE(xml_getcurrentlinenumber, NULL)
! PHP_FE(xml_getcurrentcolumnnumber, NULL)
! PHP_FE(xml_getcurrentbyteindex, NULL)
! PHP_FE(xml_parserfree, NULL)
! PHP_FE(xml_parsersetoption, NULL)
! PHP_FE(xml_parsergetoption, NULL)
{NULL, NULL, NULL}
};
--- 146,168 ----
/* {{{ extension definition structures */
function_entry xml_functions[] = {
! PHP_FE(xml_parser_create, NULL)
! PHP_FE(xml_set_element_handler, NULL)
! PHP_FE(xml_set_character_data_handler, NULL)
! PHP_FE(xml_set_processing_instruction_handler, NULL)
! PHP_FE(xml_set_default_handler, NULL)
! PHP_FE(xml_set_unparsed_entity_decl_handler, NULL)
! PHP_FE(xml_set_notation_decl_handler, NULL)
! PHP_FE(xml_set_external_entity_ref_handler, NULL)
PHP_FE(xml_parse, NULL)
! PHP_FE(xml_get_error_code, NULL)
! PHP_FE(xml_error_string, NULL)
! PHP_FE(xml_get_current_line_number, NULL)
! PHP_FE(xml_get_current_column_number, NULL)
! PHP_FE(xml_get_current_byte_index, NULL)
! PHP_FE(xml_parser_free, NULL)
! PHP_FE(xml_parser_set_option, NULL)
! PHP_FE(xml_parser_get_option, NULL)
{NULL, NULL, NULL}
};
***************
*** 712,720 ****
/************************* EXTENSION FUNCTIONS *************************/
! /* {{{ int XML_ParserCreate() */
! PHP_FUNCTION(xml_parsercreate)
{
xml_parser *parser;
int id;
--- 712,720 ----
/************************* EXTENSION FUNCTIONS *************************/
! /* {{{ int Xml_Parser_Create() */
! PHP_FUNCTION(xml_parser_create)
{
xml_parser *parser;
int id;
***************
*** 735,741 ****
XML_SetNotationDeclHandler(parser->parser, php3i_xml_notationDeclHandler);
XML_SetExternalEntityRefHandler(parser->parser, php3i_xml_externalEntityRefHandler);
id = php3_list_insert(parser, XML_GLOBAL(php3_xml_module).le_xml_parser);
! parser = xml_get_parser(id, "XML_ParserCreate", list);
parser->index = id;
parser->case_folding = 1;
--- 735,741 ----
XML_SetNotationDeclHandler(parser->parser, php3i_xml_notationDeclHandler);
XML_SetExternalEntityRefHandler(parser->parser, php3i_xml_externalEntityRefHandler);
id = php3_list_insert(parser, XML_GLOBAL(php3_xml_module).le_xml_parser);
! parser = xml_get_parser(id, "xml_parser_create", list);
parser->index = id;
parser->case_folding = 1;
***************
*** 743,751 ****
}
/* }}} */
! /* {{{ int XML_SetElementHandler(int pind, string shdl, string ehdl) */
! PHP_FUNCTION(xml_setelementhandler)
{
xml_parser *parser;
pval *pind, *shdl, *ehdl;
--- 743,751 ----
}
/* }}} */
! /* {{{ int xml_set_element_handler(int pind, string shdl, string ehdl) */
! PHP_FUNCTION(xml_set_element_handler)
{
xml_parser *parser;
pval *pind, *shdl, *ehdl;
***************
*** 758,764 ****
convert_to_long(pind);
convert_to_string(shdl);
convert_to_string(ehdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetElementHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 758,764 ----
convert_to_long(pind);
convert_to_string(shdl);
convert_to_string(ehdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_element_handler", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 768,776 ****
}
/* }}} */
! /* {{{ int XML_SetCharacterDataHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setcharacterdatahandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 768,776 ----
}
/* }}} */
! /* {{{ int xml_set_character_data_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_character_data_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 781,787 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetCharacterDataHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 781,787 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_character_data_handler", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 790,798 ****
}
/* }}} */
! /* {{{ int XML_SetProcessingInstructionHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setprocessinginstructionhandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 790,798 ----
}
/* }}} */
! /* {{{ int xml_set_processing_instruction_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_processing_instruction_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 803,809 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetProcessingInstructionHandler",
list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 803,809 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_processing_instruction_handler",
list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 812,820 ****
}
/* }}} */
! /* {{{ int XML_SetDefaultHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setdefaulthandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 812,820 ----
}
/* }}} */
! /* {{{ int xml_set_default_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_default_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 825,831 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetDefaultHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 825,831 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_default_handler", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 834,842 ****
}
/* }}} */
! /* {{{ int XML_SetUnparsedEntityDeclHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setunparsedentitydeclhandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 834,842 ----
}
/* }}} */
! /* {{{ int xml_set_unparsed_entity_decl_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_unparsed_entity_decl_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 847,853 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetUnparsedEntityDeclHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 847,853 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_unparsed_entity_decl_handler",
list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 856,864 ****
}
/* }}} */
! /* {{{ int XML_SetNotationDeclHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setnotationdeclhandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 856,864 ----
}
/* }}} */
! /* {{{ int xml_set_notation_decl_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_notation_decl_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 869,875 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetNotationDeclHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 869,875 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_notation_decl_handler", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 878,886 ****
}
/* }}} */
! /* {{{ int XML_SetExternalEntityRefHandler(int pind, string hdl) */
! PHP_FUNCTION(xml_setexternalentityrefhandler)
{
xml_parser *parser;
pval *pind, *hdl;
--- 878,886 ----
}
/* }}} */
! /* {{{ int xml_set_external_entity_ref_handler(int pind, string hdl) */
! PHP_FUNCTION(xml_set_external_entity_ref_handler)
{
xml_parser *parser;
pval *pind, *hdl;
***************
*** 891,897 ****
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "XML_SetExternalEntityRefHandler", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 891,897 ----
}
convert_to_long(pind);
convert_to_string(hdl);
! parser = xml_get_parser(pind->value.lval, "xml_set_external_entity_ref_handler",
list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 931,939 ****
}
/* }}} */
! /* {{{ int XML_GetErrorCode(int pind) */
! PHP_FUNCTION(xml_geterrorcode)
{
xml_parser *parser;
pval *pind;
--- 931,939 ----
}
/* }}} */
! /* {{{ int xml_get_error_code(int pind) */
! PHP_FUNCTION(xml_get_error_code)
{
xml_parser *parser;
pval *pind;
***************
*** 943,949 ****
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "XML_GetErrorCode", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 943,949 ----
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "xml_get_error_code", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 951,959 ****
}
/* }}} */
! /* {{{ string XML_ErrorString(int code) */
! PHP_FUNCTION(xml_errorstring)
{
pval *code;
char *str;
--- 951,959 ----
}
/* }}} */
! /* {{{ string xml_error_string(int code) */
! PHP_FUNCTION(xml_error_string)
{
pval *code;
char *str;
***************
*** 970,978 ****
}
/* }}} */
! /* {{{ int XML_GetCurrentLineNumber(int pind) */
! PHP_FUNCTION(xml_getcurrentlinenumber)
{
xml_parser *parser;
pval *pind;
--- 970,978 ----
}
/* }}} */
! /* {{{ int xml_get_current_line_number(int pind) */
! PHP_FUNCTION(xml_get_current_line_number)
{
xml_parser *parser;
pval *pind;
***************
*** 982,988 ****
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "XML_GetCurrentLineNumber", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 982,988 ----
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "xml_get_current_line_number", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 990,998 ****
}
/* }}} */
! /* {{{ int XML_GetCurrentColumnNumber(int pind) */
! PHP_FUNCTION(xml_getcurrentcolumnnumber)
{
xml_parser *parser;
pval *pind;
--- 990,998 ----
}
/* }}} */
! /* {{{ int xml_get_current_column_number(int pind) */
! PHP_FUNCTION(xml_get_current_column_number)
{
xml_parser *parser;
pval *pind;
***************
*** 1002,1008 ****
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "XML_GetCurrentColumnNumber", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 1002,1008 ----
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "xml_get_current_column_number", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 1010,1018 ****
}
/* }}} */
! /* {{{ int XML_GetCurrentByteIndex(int pind) */
! PHP_FUNCTION(xml_getcurrentbyteindex)
{
xml_parser *parser;
pval *pind;
--- 1010,1018 ----
}
/* }}} */
! /* {{{ int xml_get_current_byte_index(int pind) */
! PHP_FUNCTION(xml_get_current_byte_index)
{
xml_parser *parser;
pval *pind;
***************
*** 1022,1028 ****
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "XML_GetCurrentByteIndex", list);
if (parser == NULL) {
RETURN_FALSE;
}
--- 1022,1028 ----
WRONG_PARAM_COUNT;
}
convert_to_long(pind);
! parser = xml_get_parser(pind->value.lval, "xml_get_current_byte_index", list);
if (parser == NULL) {
RETURN_FALSE;
}
***************
*** 1030,1038 ****
}
/* }}} */
! /* {{{ int XML_ParserFree(int pind) */
! PHP_FUNCTION(xml_parserfree)
{
pval *pind;
XML_TLS_VARS;
--- 1030,1038 ----
}
/* }}} */
! /* {{{ int xml_parser_free(int pind) */
! PHP_FUNCTION(xml_parser_free)
{
pval *pind;
XML_TLS_VARS;
***************
*** 1048,1060 ****
}
/* }}} */
! /* {{{ int XML_ParserSetOption(int pind, int option, mixed value) */
! PHP_FUNCTION(xml_parsersetoption)
{
xml_parser *parser;
pval *pind, *opt, *val;
! char thisfunc[] = "XML_ParserSetOption";
XML_TLS_VARS;
if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &pind, &opt, &val) == FAILURE) {
--- 1048,1060 ----
}
/* }}} */
! /* {{{ int xml_parser_set_option(int pind, int option, mixed value) */
! PHP_FUNCTION(xml_parser_set_option)
{
xml_parser *parser;
pval *pind, *opt, *val;
! char thisfunc[] = "xml_parser_set_option";
XML_TLS_VARS;
if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &pind, &opt, &val) == FAILURE) {
***************
*** 1080,1092 ****
}
/* }}} */
! /* {{{ int XML_ParserGetOption(int pind, int option) */
! PHP_FUNCTION(xml_parsergetoption)
{
xml_parser *parser;
pval *pind, *opt;
! char thisfunc[] = "XML_ParserGetOption";
XML_TLS_VARS;
if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &pind, &opt) == FAILURE) {
--- 1080,1092 ----
}
/* }}} */
! /* {{{ int xml_parser_get_option(int pind, int option) */
! PHP_FUNCTION(xml_parser_get_option)
{
xml_parser *parser;
pval *pind, *opt;
! char thisfunc[] = "xml_parser_get_option";
XML_TLS_VARS;
if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &pind, &opt) == FAILURE) {
Index: php3/functions/php3_xml.h
diff -c php3/functions/php3_xml.h:1.3 php3/functions/php3_xml.h:1.4
*** php3/functions/php3_xml.h:1.3 Wed Oct 21 09:43:49 1998
--- php3/functions/php3_xml.h Fri Oct 23 07:18:23 1998
***************
*** 68,90 ****
php3_error(E_WARNING, "Out of memory");\
RETURN_FALSE
! PHP_FUNCTION(xml_parsercreate);
! PHP_FUNCTION(xml_setelementhandler);
! PHP_FUNCTION(xml_setcharacterdatahandler);
! PHP_FUNCTION(xml_setprocessinginstructionhandler);
! PHP_FUNCTION(xml_setdefaulthandler);
! PHP_FUNCTION(xml_setunparsedentitydeclhandler);
! PHP_FUNCTION(xml_setnotationdeclhandler);
! PHP_FUNCTION(xml_setexternalentityrefhandler);
PHP_FUNCTION(xml_parse);
! PHP_FUNCTION(xml_geterrorcode);
! PHP_FUNCTION(xml_errorstring);
! PHP_FUNCTION(xml_getcurrentlinenumber);
! PHP_FUNCTION(xml_getcurrentcolumnnumber);
! PHP_FUNCTION(xml_getcurrentbyteindex);
! PHP_FUNCTION(xml_parserfree);
! PHP_FUNCTION(xml_parsersetoption);
! PHP_FUNCTION(xml_parsergetoption);
#else /* !HAVE_LIBEXPAT */
--- 68,90 ----
php3_error(E_WARNING, "Out of memory");\
RETURN_FALSE
! PHP_FUNCTION(xml_parser_create);
! PHP_FUNCTION(xml_set_element_handler);
! PHP_FUNCTION(xml_set_character_data_handler);
! PHP_FUNCTION(xml_set_processing_instruction_handler);
! PHP_FUNCTION(xml_set_default_handler);
! PHP_FUNCTION(xml_set_unparsed_entity_decl_handler);
! PHP_FUNCTION(xml_set_notation_decl_handler);
! PHP_FUNCTION(xml_set_external_entity_ref_handler);
PHP_FUNCTION(xml_parse);
! PHP_FUNCTION(xml_get_error_code);
! PHP_FUNCTION(xml_error_string);
! PHP_FUNCTION(xml_get_current_line_number);
! PHP_FUNCTION(xml_get_current_column_number);
! PHP_FUNCTION(xml_get_current_byte_index);
! PHP_FUNCTION(xml_parser_free);
! PHP_FUNCTION(xml_parser_set_option);
! PHP_FUNCTION(xml_parser_get_option);
#else /* !HAVE_LIBEXPAT */
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net