diff options
| -rw-r--r-- | ext/unicode/php_transform.h | 2 | ||||
| -rw-r--r-- | ext/unicode/transform.c | 22 | ||||
| -rw-r--r-- | ext/unicode/unicode.c | 2 |
3 files changed, 3 insertions, 23 deletions
diff --git a/ext/unicode/php_transform.h b/ext/unicode/php_transform.h index 41118447d7..16b451aa84 100644 --- a/ext/unicode/php_transform.h +++ b/ext/unicode/php_transform.h @@ -19,7 +19,7 @@ #ifndef PHP_TRANSFORM_H #define PHP_TRANSFORM_H -PHP_FUNCTION(transliterate); +PHP_FUNCTION(str_transliterate); #endif /* PHP_TRANSFORM_H */ diff --git a/ext/unicode/transform.c b/ext/unicode/transform.c index 6787eda60b..8f7e0f6879 100644 --- a/ext/unicode/transform.c +++ b/ext/unicode/transform.c @@ -18,7 +18,7 @@ #include "php_unicode.h" -PHP_FUNCTION(transliterate) +PHP_FUNCTION(str_transliterate) { UChar *str, *from, *to, *variant = NULL; int str_len, from_len, to_len, variant_len = 0; @@ -30,26 +30,6 @@ PHP_FUNCTION(transliterate) UErrorCode status = U_ZERO_ERROR; int32_t capacity, start, limit; - /* - { - - char *str; - int32_t str_len; - UEnumeration *ids; - - ids = utrans_openIDs(&status); - printf("%d\n", uenum_count(ids, &status)); - str = (char*)uenum_next(ids, &str_len, &status); - while (str) { - printf("id: %s\n", str); - str = (char*)uenum_next(ids, &str_len, &status); - } - uenum_close(ids); - } - - return; - */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "uuu|u", &str, &str_len, &from, &from_len, &to, &to_len, &variant, &variant_len) == FAILURE) { diff --git a/ext/unicode/unicode.c b/ext/unicode/unicode.c index 4611eea899..98367b0638 100644 --- a/ext/unicode/unicode.c +++ b/ext/unicode/unicode.c @@ -301,7 +301,7 @@ zend_function_entry unicode_functions[] = { /* text transformation functions */ - PHP_FE(transliterate, NULL) + PHP_FE(str_transliterate, NULL) { NULL, NULL, NULL } }; |