archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix collator instantiation.

Browse source
This commit is contained in:
Andrei Zmievski 2006-03-28 04:33:29 +00:00
parent cbbfebc428
commit 3eee3a5fd6
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/unicode/collator.c
View file

@ -155,14 +155,18 @@ static void collator_object_free_storage(void *object TSRMLS_DC)
static zval* collator_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC) static zval* collator_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{ {
/* FIXME
* not sure what what this is for but moved here so it doesn't break stuff
* below
*/
if (!object) { if (!object) {
ALLOC_ZVAL(object); ALLOC_ZVAL(object);
object->refcount = 1;
object->is_ref = 1;
} }
Z_TYPE_P(object) = IS_OBJECT; Z_TYPE_P(object) = IS_OBJECT;
object_init_ex(object, pce); object_init_ex(object, pce);
object->refcount = 1;
object->is_ref = 1;
return object; return object;
} }
@ -177,13 +181,17 @@ PHP_FUNCTION(collator_create)
UErrorCode error; UErrorCode error;
char *collator_name; char *collator_name;
int collator_name_len; int collator_name_len;
zval *object;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &collator_name, &collator_name_len) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &collator_name, &collator_name_len) == FAILURE) {
RETURN_FALSE; RETURN_FALSE;
} }
collator_instantiate(unicode_ce_collator, return_value TSRMLS_CC); if ((object = getThis()) == NULL) {
collatorobj = (php_collator_obj *) zend_object_store_get_object(return_value TSRMLS_CC); object = return_value;
}
collator_instantiate(unicode_ce_collator, object TSRMLS_CC);
collatorobj = (php_collator_obj *) zend_object_store_get_object(object TSRMLS_CC);
error = U_ZERO_ERROR; error = U_ZERO_ERROR;
collatorobj->col = ucol_open(collator_name, &error); collatorobj->col = ucol_open(collator_name, &error);
} }