diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 23:06:14 +0100 |
| commit | bdeb220f48825642f84cdbf3ff23a30613c92e86 (patch) | |
| tree | 1a6cf34d20420e4815b4becb21311a4457d84103 /ext/standard/cyr_convert.c | |
| parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
| download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz | |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/standard/cyr_convert.c')
| -rw-r--r-- | ext/standard/cyr_convert.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c index 1718b75729..073d9d206f 100644 --- a/ext/standard/cyr_convert.c +++ b/ext/standard/cyr_convert.c @@ -187,7 +187,7 @@ _cyr_mac = { }; /* }}} */ -/* {{{ static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to TSRMLS_DC) +/* {{{ static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to) * This is the function that performs real in-place conversion of the string * between charsets. * Parameters: @@ -201,7 +201,7 @@ _cyr_mac = { * d - x-cp866 * m - x-mac-cyrillic *****************************************************************************/ -static char * php_convert_cyr_string(unsigned char *str, size_t length, char from, char to TSRMLS_DC) +static char * php_convert_cyr_string(unsigned char *str, size_t length, char from, char to) { const unsigned char *from_table, *to_table; unsigned char tmp; @@ -228,7 +228,7 @@ static char * php_convert_cyr_string(unsigned char *str, size_t length, char fro case 'K': break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown source charset: %c", from); + php_error_docref(NULL, E_WARNING, "Unknown source charset: %c", from); break; } @@ -250,7 +250,7 @@ static char * php_convert_cyr_string(unsigned char *str, size_t length, char fro case 'K': break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown destination charset: %c", to); + php_error_docref(NULL, E_WARNING, "Unknown destination charset: %c", to); break; } @@ -274,13 +274,13 @@ PHP_FUNCTION(convert_cyr_string) size_t input_len, fr_cs_len, to_cs_len; zend_string *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &input, &input_len, &fr_cs, &fr_cs_len, &to_cs, &to_cs_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "sss", &input, &input_len, &fr_cs, &fr_cs_len, &to_cs, &to_cs_len) == FAILURE) { return; } str = zend_string_init(input, input_len, 0); - php_convert_cyr_string((unsigned char *) str->val, str->len, fr_cs[0], to_cs[0] TSRMLS_CC); + php_convert_cyr_string((unsigned char *) str->val, str->len, fr_cs[0], to_cs[0]); RETVAL_NEW_STR(str); } /* }}} */ |