diff options
Diffstat (limited to 'ext/intl/collator')
| -rw-r--r-- | ext/intl/collator/collator_class.c | 6 | ||||
| -rw-r--r-- | ext/intl/collator/collator_convert.c | 4 | ||||
| -rw-r--r-- | ext/intl/collator/collator_create.c | 2 | ||||
| -rw-r--r-- | ext/intl/collator/collator_sort.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c index 5632dc0f76..48fc368060 100644 --- a/ext/intl/collator/collator_class.c +++ b/ext/intl/collator/collator_class.c @@ -134,10 +134,10 @@ void collator_register_Collator_class( void ) memcpy(&Collator_handlers, zend_get_std_object_handlers(), sizeof Collator_handlers); - /* Collator has no usable clone semantics - ucol_cloneBinary/ucol_openBinary require binary buffer - for which we don't have the place to keep */ + /* Collator has no usable clone semantics - ucol_cloneBinary/ucol_openBinary require binary buffer + for which we don't have the place to keep */ Collator_handlers.offset = XtOffsetOf(Collator_object, zo); - Collator_handlers.clone_obj = NULL; + Collator_handlers.clone_obj = NULL; Collator_handlers.dtor_obj = Collator_objects_dtor; Collator_handlers.free_obj = Collator_objects_free; diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert.c index fb8530c9f9..1ee13d8b39 100644 --- a/ext/intl/collator/collator_convert.c +++ b/ext/intl/collator/collator_convert.c @@ -215,7 +215,7 @@ zval* collator_convert_zstr_utf8_to_utf16( zval* utf8_zval, zval *rv ) /* Set string. */ zstr = rv; ZVAL_STRINGL( zstr, (char*)ustr, UBYTES(ustr_len)); - //??? + //??? efree((char *)ustr); return zstr; @@ -400,7 +400,7 @@ zval* collator_make_printable_zval( zval* arg, zval *rv) if( Z_TYPE_P(arg) != IS_STRING ) { - + use_copy = zend_make_printable_zval(arg, &arg_copy); if( use_copy ) diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c index 2d98ea9d01..dd81ebe8f7 100644 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c @@ -55,7 +55,7 @@ static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS) co->ucoll = ucol_open( locale, COLLATOR_ERROR_CODE_P( co ) ); INTL_CTOR_CHECK_STATUS(co, "collator_create: unable to open ICU collator"); } -/* }}} */ +/* }}} */ /* {{{ proto Collator collator_create( string $locale ) * Create collator. diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index 16f68d06ac..46571e5ead 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -93,7 +93,7 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2) if( num1_p == str1_p ) { /* str1 is string but not numeric string - * just convert it to utf8. + * just convert it to utf8. */ norm1_p = collator_convert_zstr_utf16_to_utf8( str1_p, &norm1 ); @@ -585,7 +585,7 @@ PHP_FUNCTION( collator_get_sort_key ) RETURN_FALSE; } - /* ucol_getSortKey is exception in that the key length includes the + /* ucol_getSortKey is exception in that the key length includes the * NUL terminator*/ key_len = ucol_getSortKey(co->ucoll, ustr, ustr_len, key, 0); if(!key_len) { |