andrei Fri Apr 21 21:10:01 2006 UTC
Modified files:
/php-src/ext/unicode collator.c php_unicode.h unicode.c
Log:
Add collator_set_default().
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/collator.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/unicode/collator.c
diff -u php-src/ext/unicode/collator.c:1.6 php-src/ext/unicode/collator.c:1.7
--- php-src/ext/unicode/collator.c:1.6 Fri Apr 21 19:40:57 2006
+++ php-src/ext/unicode/collator.c Fri Apr 21 21:10:01 2006
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: collator.c,v 1.6 2006/04/21 19:40:57 andrei Exp $ */
+/* $Id: collator.c,v 1.7 2006/04/21 21:10:01 andrei Exp $ */
#include "php.h"
#include "ext/standard/php_array.h"
@@ -26,13 +26,14 @@
zend_function_entry collator_funcs_collator[] = {
ZEND_ME(collator, __construct, NULL, ZEND_ACC_PUBLIC)
- ZEND_FENTRY(getDefault, ZEND_FN(collator_get_default), NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
- ZEND_NAMED_FE(compare, ZEND_FN(collator_compare), NULL)
- ZEND_NAMED_FE(setStrength, ZEND_FN(collator_set_strength), NULL)
+ ZEND_FENTRY(getDefault, ZEND_FN(collator_get_default), NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ ZEND_FENTRY(setDefault, ZEND_FN(collator_set_default), NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ ZEND_NAMED_FE(compare, ZEND_FN(collator_compare), NULL)
+ ZEND_NAMED_FE(setStrength, ZEND_FN(collator_set_strength), NULL)
ZEND_NAMED_FE(setAttribute, ZEND_FN(collator_set_attribute), NULL)
- ZEND_NAMED_FE(getStrength, ZEND_FN(collator_get_strength), NULL)
+ ZEND_NAMED_FE(getStrength, ZEND_FN(collator_get_strength), NULL)
ZEND_NAMED_FE(getAttribute, ZEND_FN(collator_get_attribute), NULL)
- ZEND_NAMED_FE(sort, ZEND_FN(collator_sort), NULL)
+ ZEND_NAMED_FE(sort, ZEND_FN(collator_sort), NULL)
{NULL, NULL, NULL}
};
@@ -290,12 +291,12 @@
RETURN_LONG(value);
}
-/* {{{ proto object collator_get_default(void) U
+/* {{{ proto Collator collator_get_default(void) U
Returns default collator */
PHP_FUNCTION(collator_get_default)
{
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
- return;
+ RETURN_FALSE;
}
UG(default_collator)->refcount++;
@@ -303,6 +304,26 @@
}
/* }}} */
+/* {{{ proto void collator_set_default(Collator coll) U
+ Returns default collator */
+PHP_FUNCTION(collator_set_default)
+{
+ zval *coll;
+ php_collator_obj *coll_obj;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &coll,
unicode_collator_ce) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ coll_obj = (php_collator_obj *) zend_object_store_get_object(coll
TSRMLS_CC);
+ zend_collator_destroy(UG(default_collator));
+ coll_obj->zcoll->refcount++;
+ UG(default_collator) = coll_obj->zcoll;
+
+ RETURN_TRUE;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_unicode.h?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/unicode/php_unicode.h
diff -u php-src/ext/unicode/php_unicode.h:1.10
php-src/ext/unicode/php_unicode.h:1.11
--- php-src/ext/unicode/php_unicode.h:1.10 Fri Apr 21 19:35:26 2006
+++ php-src/ext/unicode/php_unicode.h Fri Apr 21 21:10:01 2006
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_unicode.h,v 1.10 2006/04/21 19:35:26 andrei Exp $ */
+/* $Id: php_unicode.h,v 1.11 2006/04/21 21:10:01 andrei Exp $ */
#ifndef PHP_UNICODE_H
#define PHP_UNICODE_H
@@ -57,7 +57,6 @@
PHP_FUNCTION(locale_get_default);
PHP_FUNCTION(locale_set_default);
-PHP_FUNCTION(collator_get_default);
PHP_FUNCTION(collator_create);
PHP_FUNCTION(collator_compare);
PHP_FUNCTION(collator_sort);
@@ -65,6 +64,8 @@
PHP_FUNCTION(collator_set_attribute);
PHP_FUNCTION(collator_get_strength);
PHP_FUNCTION(collator_get_attribute);
+PHP_FUNCTION(collator_get_default);
+PHP_FUNCTION(collator_set_default);
PHP_METHOD(collator, __construct);
void php_init_collation(TSRMLS_D);
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/unicode/unicode.c
diff -u php-src/ext/unicode/unicode.c:1.22 php-src/ext/unicode/unicode.c:1.23
--- php-src/ext/unicode/unicode.c:1.22 Fri Apr 21 19:35:26 2006
+++ php-src/ext/unicode/unicode.c Fri Apr 21 21:10:01 2006
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode.c,v 1.22 2006/04/21 19:35:26 andrei Exp $ */
+/* $Id: unicode.c,v 1.23 2006/04/21 21:10:01 andrei Exp $ */
#include "php_unicode.h"
#include "zend_unicode.h"
@@ -245,6 +245,7 @@
PHP_FE(collator_create, NULL)
PHP_FE(collator_compare, NULL)
PHP_FE(collator_get_default, NULL)
+ PHP_FE(collator_set_default, NULL)
{ NULL, NULL, NULL }
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
