diff options
Diffstat (limited to 'Zend/zend_multibyte.c')
| -rw-r--r-- | Zend/zend_multibyte.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c index 49056cfad4..9f7f72e274 100644 --- a/Zend/zend_multibyte.c +++ b/Zend/zend_multibyte.c @@ -25,7 +25,7 @@ #include "zend_multibyte.h" #include "zend_ini.h" -static const zend_encoding *dummy_encoding_fetcher(const char *encoding_name TSRMLS_DC) +static const zend_encoding *dummy_encoding_fetcher(const char *encoding_name) { return NULL; } @@ -40,29 +40,29 @@ static int dummy_encoding_lexer_compatibility_checker(const zend_encoding *encod return 0; } -static const zend_encoding *dummy_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size TSRMLS_DC) +static const zend_encoding *dummy_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size) { return NULL; } -static size_t dummy_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from TSRMLS_DC) +static size_t dummy_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from) { return (size_t)-1; } -static int dummy_encoding_list_parser(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent TSRMLS_DC) +static int dummy_encoding_list_parser(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent) { *return_list = pemalloc(0, persistent); *return_size = 0; return SUCCESS; } -static const zend_encoding *dummy_internal_encoding_getter(TSRMLS_D) +static const zend_encoding *dummy_internal_encoding_getter(void) { return NULL; } -static int dummy_internal_encoding_setter(const zend_encoding *encoding TSRMLS_DC) +static int dummy_internal_encoding_setter(const zend_encoding *encoding) { return FAILURE; } @@ -85,25 +85,25 @@ ZEND_API const zend_encoding *zend_multibyte_encoding_utf16be = (const zend_enco ZEND_API const zend_encoding *zend_multibyte_encoding_utf16le = (const zend_encoding*)"UTF-32LE"; ZEND_API const zend_encoding *zend_multibyte_encoding_utf8 = (const zend_encoding*)"UTF-8"; -ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions TSRMLS_DC) +ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functions) { - zend_multibyte_encoding_utf32be = functions->encoding_fetcher("UTF-32BE" TSRMLS_CC); + zend_multibyte_encoding_utf32be = functions->encoding_fetcher("UTF-32BE"); if (!zend_multibyte_encoding_utf32be) { return FAILURE; } - zend_multibyte_encoding_utf32le = functions->encoding_fetcher("UTF-32LE" TSRMLS_CC); + zend_multibyte_encoding_utf32le = functions->encoding_fetcher("UTF-32LE"); if (!zend_multibyte_encoding_utf32le) { return FAILURE; } - zend_multibyte_encoding_utf16be = functions->encoding_fetcher("UTF-16BE" TSRMLS_CC); + zend_multibyte_encoding_utf16be = functions->encoding_fetcher("UTF-16BE"); if (!zend_multibyte_encoding_utf16be) { return FAILURE; } - zend_multibyte_encoding_utf16le = functions->encoding_fetcher("UTF-16LE" TSRMLS_CC); + zend_multibyte_encoding_utf16le = functions->encoding_fetcher("UTF-16LE"); if (!zend_multibyte_encoding_utf16le) { return FAILURE; } - zend_multibyte_encoding_utf8 = functions->encoding_fetcher("UTF-8" TSRMLS_CC); + zend_multibyte_encoding_utf8 = functions->encoding_fetcher("UTF-8"); if (!zend_multibyte_encoding_utf8) { return FAILURE; } @@ -115,19 +115,19 @@ ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functi */ { const char *value = zend_ini_string("zend.script_encoding", sizeof("zend.script_encoding") - 1, 0); - zend_multibyte_set_script_encoding_by_string(value, strlen(value) TSRMLS_CC); + zend_multibyte_set_script_encoding_by_string(value, strlen(value)); } return SUCCESS; } -ZEND_API const zend_multibyte_functions *zend_multibyte_get_functions(TSRMLS_D) +ZEND_API const zend_multibyte_functions *zend_multibyte_get_functions(void) { return multibyte_functions.provider_name ? &multibyte_functions: NULL; } -ZEND_API const zend_encoding *zend_multibyte_fetch_encoding(const char *name TSRMLS_DC) +ZEND_API const zend_encoding *zend_multibyte_fetch_encoding(const char *name) { - return multibyte_functions.encoding_fetcher(name TSRMLS_CC); + return multibyte_functions.encoding_fetcher(name); } ZEND_API const char *zend_multibyte_get_encoding_name(const zend_encoding *encoding) @@ -140,32 +140,32 @@ ZEND_API int zend_multibyte_check_lexer_compatibility(const zend_encoding *encod return multibyte_functions.lexer_compatibility_checker(encoding); } -ZEND_API const zend_encoding *zend_multibyte_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size TSRMLS_DC) +ZEND_API const zend_encoding *zend_multibyte_encoding_detector(const unsigned char *string, size_t length, const zend_encoding **list, size_t list_size) { - return multibyte_functions.encoding_detector(string, length, list, list_size TSRMLS_CC); + return multibyte_functions.encoding_detector(string, length, list, list_size); } -ZEND_API size_t zend_multibyte_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from TSRMLS_DC) +ZEND_API size_t zend_multibyte_encoding_converter(unsigned char **to, size_t *to_length, const unsigned char *from, size_t from_length, const zend_encoding *encoding_to, const zend_encoding *encoding_from) { - return multibyte_functions.encoding_converter(to, to_length, from, from_length, encoding_to, encoding_from TSRMLS_CC); + return multibyte_functions.encoding_converter(to, to_length, from, from_length, encoding_to, encoding_from); } -ZEND_API int zend_multibyte_parse_encoding_list(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent TSRMLS_DC) +ZEND_API int zend_multibyte_parse_encoding_list(const char *encoding_list, size_t encoding_list_len, const zend_encoding ***return_list, size_t *return_size, int persistent) { - return multibyte_functions.encoding_list_parser(encoding_list, encoding_list_len, return_list, return_size, persistent TSRMLS_CC); + return multibyte_functions.encoding_list_parser(encoding_list, encoding_list_len, return_list, return_size, persistent); } -ZEND_API const zend_encoding *zend_multibyte_get_internal_encoding(TSRMLS_D) +ZEND_API const zend_encoding *zend_multibyte_get_internal_encoding(void) { - return multibyte_functions.internal_encoding_getter(TSRMLS_C); + return multibyte_functions.internal_encoding_getter(); } -ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(TSRMLS_D) +ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(void) { return LANG_SCNG(script_encoding); } -ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size TSRMLS_DC) +ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size) { if (CG(script_encoding_list)) { free((char*)CG(script_encoding_list)); @@ -175,22 +175,22 @@ ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_l return SUCCESS; } -ZEND_API int zend_multibyte_set_internal_encoding(const zend_encoding *encoding TSRMLS_DC) +ZEND_API int zend_multibyte_set_internal_encoding(const zend_encoding *encoding) { - return multibyte_functions.internal_encoding_setter(encoding TSRMLS_CC); + return multibyte_functions.internal_encoding_setter(encoding); } -ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, size_t new_value_length TSRMLS_DC) +ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, size_t new_value_length) { const zend_encoding **list = 0; size_t size = 0; if (!new_value) { - zend_multibyte_set_script_encoding(NULL, 0 TSRMLS_CC); + zend_multibyte_set_script_encoding(NULL, 0); return SUCCESS; } - if (FAILURE == zend_multibyte_parse_encoding_list(new_value, new_value_length, &list, &size, 1 TSRMLS_CC)) { + if (FAILURE == zend_multibyte_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) { return FAILURE; } @@ -199,7 +199,7 @@ ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, return FAILURE; } - if (FAILURE == zend_multibyte_set_script_encoding(list, size TSRMLS_CC)) { + if (FAILURE == zend_multibyte_set_script_encoding(list, size)) { return FAILURE; } |