diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-18 03:20:53 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-18 03:20:53 +0000 |
| commit | 8a581c3536e1c4fab7ecfa4e1c044d3e5ebc5ab2 (patch) | |
| tree | b200bbd8353d472462fbcb9660adf2a0d961b0a7 /ext/xml/xml.c | |
| parent | cce755591b2091f0d92422b5031ca40d27a6e55a (diff) | |
| download | php-git-8a581c3536e1c4fab7ecfa4e1c044d3e5ebc5ab2.tar.gz | |
More php3_ annihilation
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 88a8142d56..d6f5296791 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -148,7 +148,6 @@ static int le_xml_parser; /* }}} */ /* {{{ startup, shutdown and info functions */ -/* {{{ php3_minit_xml */ #ifdef ZTS static void php_xml_init_globals(php_xml_globals *xml_globals) @@ -193,48 +192,39 @@ PHP_MINIT_FUNCTION(xml) REGISTER_LONG_CONSTANT("XML_ERROR_UNCLOSED_CDATA_SECTION", XML_ERROR_UNCLOSED_CDATA_SECTION, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_ERROR_EXTERNAL_ENTITY_HANDLING", XML_ERROR_EXTERNAL_ENTITY_HANDLING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP3_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP3_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP3_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP3_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_CASE_FOLDING", PHP_XML_OPTION_CASE_FOLDING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_TARGET_ENCODING", PHP_XML_OPTION_TARGET_ENCODING, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_TAGSTART", PHP_XML_OPTION_SKIP_TAGSTART, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("XML_OPTION_SKIP_WHITE", PHP_XML_OPTION_SKIP_WHITE, CONST_CS|CONST_PERSISTENT); return SUCCESS; } -/* }}} */ -/* {{{ php3_rinit_xml */ PHP_RINIT_FUNCTION(xml) { return SUCCESS; } -/* }}} */ -/* {{{ php3_mshutdown_xml() */ PHP_MSHUTDOWN_FUNCTION(xml) { return SUCCESS; } -/* }}} */ -/* {{{ php3_rshutdown_xml() */ PHP_RSHUTDOWN_FUNCTION(xml) { return SUCCESS; } -/* }}} */ -/* {{{ php3_info_xml() */ PHP_MINFO_FUNCTION(xml) { PUTS("XML support active"); } -/* }}} */ /* {{{ extension-internal functions */ @@ -1405,19 +1395,19 @@ PHP_FUNCTION(xml_parser_set_option) convert_to_long_ex(opt); switch ((*opt)->value.lval) { - case PHP3_XML_OPTION_CASE_FOLDING: + case PHP_XML_OPTION_CASE_FOLDING: convert_to_long_ex(val); parser->case_folding = (*val)->value.lval; break; - case PHP3_XML_OPTION_SKIP_TAGSTART: + case PHP_XML_OPTION_SKIP_TAGSTART: convert_to_long_ex(val); parser->toffset = (*val)->value.lval; break; - case PHP3_XML_OPTION_SKIP_WHITE: + case PHP_XML_OPTION_SKIP_WHITE: convert_to_long_ex(val); parser->skipwhite = (*val)->value.lval; break; - case PHP3_XML_OPTION_TARGET_ENCODING: { + case PHP_XML_OPTION_TARGET_ENCODING: { xml_encoding *enc; convert_to_string_ex(val); enc = xml_get_encoding((*val)->value.str.val); @@ -1454,10 +1444,10 @@ PHP_FUNCTION(xml_parser_get_option) convert_to_long_ex(opt); switch ((*opt)->value.lval) { - case PHP3_XML_OPTION_CASE_FOLDING: + case PHP_XML_OPTION_CASE_FOLDING: RETURN_LONG(parser->case_folding); break; - case PHP3_XML_OPTION_TARGET_ENCODING: + case PHP_XML_OPTION_TARGET_ENCODING: RETURN_STRING(parser->target_encoding, 1); break; default: |