diff options
| author | Andrea Faulds <ajf@ajf.me> | 2016-10-13 23:33:33 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2016-10-17 15:39:02 +0100 |
| commit | 1a512eed449128334edf0329b72e53c5caaaa95b (patch) | |
| tree | c095b8ccdb00a6d364a1b1f642c5a5a218a675d6 /ext/xml/xml.c | |
| parent | a5251f78f8c3204c04d93c02b63d2e3967d3e1c1 (diff) | |
| download | php-git-1a512eed449128334edf0329b72e53c5caaaa95b.tar.gz | |
Move utf8_encode and utf8_decode to ext/standard
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f0da47dc5b..f8d72523a0 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -212,14 +212,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_get_option, 0, 0, 2) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_encode, 0, 0, 1) - ZEND_ARG_INFO(0, data) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_decode, 0, 0, 1) - ZEND_ARG_INFO(0, data) -ZEND_END_ARG_INFO() - const zend_function_entry xml_functions[] = { PHP_FE(xml_parser_create, arginfo_xml_parser_create) PHP_FE(xml_parser_create_ns, arginfo_xml_parser_create_ns) @@ -243,8 +235,6 @@ const zend_function_entry xml_functions[] = { PHP_FE(xml_parser_free, arginfo_xml_parser_free) PHP_FE(xml_parser_set_option, arginfo_xml_parser_set_option) PHP_FE(xml_parser_get_option, arginfo_xml_parser_get_option) - PHP_FE(utf8_encode, arginfo_utf8_encode) - PHP_FE(utf8_decode, arginfo_utf8_decode) PHP_FE_END }; @@ -1667,46 +1657,6 @@ PHP_FUNCTION(xml_parser_get_option) } /* }}} */ -/* {{{ proto string utf8_encode(string data) - Encodes an ISO-8859-1 string to UTF-8 */ -PHP_FUNCTION(utf8_encode) -{ - char *arg; - size_t arg_len; - zend_string *encoded; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { - return; - } - - encoded = xml_utf8_encode(arg, arg_len, (XML_Char*)"ISO-8859-1"); - if (encoded == NULL) { - RETURN_FALSE; - } - RETURN_STR(encoded); -} -/* }}} */ - -/* {{{ proto string utf8_decode(string data) - Converts a UTF-8 encoded string to ISO-8859-1 */ -PHP_FUNCTION(utf8_decode) -{ - char *arg; - size_t arg_len; - zend_string *decoded; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { - return; - } - - decoded = xml_utf8_decode((XML_Char*)arg, arg_len, (XML_Char*)"ISO-8859-1"); - if (decoded == NULL) { - RETURN_FALSE; - } - RETURN_STR(decoded); -} -/* }}} */ - #endif /* |