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/mbstring/php_unicode.c | |
| parent | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (diff) | |
| download | php-git-bdeb220f48825642f84cdbf3ff23a30613c92e86.tar.gz | |
first shot remove TSRMLS_* things
Diffstat (limited to 'ext/mbstring/php_unicode.c')
| -rw-r--r-- | ext/mbstring/php_unicode.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c index ee5b75e67a..75973c9b47 100644 --- a/ext/mbstring/php_unicode.c +++ b/ext/mbstring/php_unicode.c @@ -160,7 +160,7 @@ MBSTRING_API unsigned long php_turkish_tolower(unsigned long code, long l, long return case_lookup(code, l, r, field); } -MBSTRING_API unsigned long php_unicode_toupper(unsigned long code, enum mbfl_no_encoding enc TSRMLS_DC) +MBSTRING_API unsigned long php_unicode_toupper(unsigned long code, enum mbfl_no_encoding enc) { int field; long l, r; @@ -191,7 +191,7 @@ MBSTRING_API unsigned long php_unicode_toupper(unsigned long code, enum mbfl_no_ return case_lookup(code, l, r, field); } -MBSTRING_API unsigned long php_unicode_tolower(unsigned long code, enum mbfl_no_encoding enc TSRMLS_DC) +MBSTRING_API unsigned long php_unicode_tolower(unsigned long code, enum mbfl_no_encoding enc) { int field; long l, r; @@ -222,7 +222,7 @@ MBSTRING_API unsigned long php_unicode_tolower(unsigned long code, enum mbfl_no_ return case_lookup(code, l, r, field); } -MBSTRING_API unsigned long php_unicode_totitle(unsigned long code, enum mbfl_no_encoding enc TSRMLS_DC) +MBSTRING_API unsigned long php_unicode_totitle(unsigned long code, enum mbfl_no_encoding enc) { int field; long l, r; @@ -268,7 +268,7 @@ MBSTRING_API unsigned long php_unicode_totitle(unsigned long code, enum mbfl_no_ } MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, size_t srclen, size_t *ret_len, - const char *src_encoding TSRMLS_DC) + const char *src_encoding) { char *unicode, *newstr; size_t unicode_len; @@ -277,11 +277,11 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s enum mbfl_no_encoding _src_encoding = mbfl_name2no_encoding(src_encoding); if (_src_encoding == mbfl_no_encoding_invalid) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", src_encoding); + php_error_docref(NULL, E_WARNING, "Unknown encoding \"%s\"", src_encoding); return NULL; } - unicode = php_mb_convert_encoding(srcstr, srclen, "UCS-4BE", src_encoding, &unicode_len TSRMLS_CC); + unicode = php_mb_convert_encoding(srcstr, srclen, "UCS-4BE", src_encoding, &unicode_len); if (unicode == NULL) return NULL; @@ -291,14 +291,14 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s case PHP_UNICODE_CASE_UPPER: for (i = 0; i < unicode_len; i+=4) { UINT32_TO_BE_ARY(&unicode_ptr[i], - php_unicode_toupper(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding TSRMLS_CC)); + php_unicode_toupper(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding)); } break; case PHP_UNICODE_CASE_LOWER: for (i = 0; i < unicode_len; i+=4) { UINT32_TO_BE_ARY(&unicode_ptr[i], - php_unicode_tolower(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding TSRMLS_CC)); + php_unicode_tolower(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding)); } break; @@ -312,7 +312,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s if (mode) { if (res) { UINT32_TO_BE_ARY(&unicode_ptr[i], - php_unicode_tolower(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding TSRMLS_CC)); + php_unicode_tolower(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding)); } else { mode = 0; } @@ -320,7 +320,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s if (res) { mode = 1; UINT32_TO_BE_ARY(&unicode_ptr[i], - php_unicode_totitle(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding TSRMLS_CC)); + php_unicode_totitle(BE_ARY_TO_UINT32(&unicode_ptr[i]), _src_encoding)); } } } @@ -328,7 +328,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, const char *srcstr, s } - newstr = php_mb_convert_encoding(unicode, unicode_len, src_encoding, "UCS-4BE", ret_len TSRMLS_CC); + newstr = php_mb_convert_encoding(unicode, unicode_len, src_encoding, "UCS-4BE", ret_len); efree(unicode); return newstr; |