[PHP-CVS] cvs: php-src /ext/unicode property.c

[Andrei Zmievski]

andrei          Tue May  9 00:15:45 2006 UTC

  Modified files:              
    /php-src/ext/unicode        property.c 
  Log:
  Fix and adjust.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/property.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/unicode/property.c
diff -u php-src/ext/unicode/property.c:1.12 php-src/ext/unicode/property.c:1.13
--- php-src/ext/unicode/property.c:1.12 Tue May  9 00:06:08 2006
+++ php-src/ext/unicode/property.c      Tue May  9 00:15:45 2006
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: property.c,v 1.12 2006/05/09 00:06:08 andrei Exp $ */ 
+/* $Id: property.c,v 1.13 2006/05/09 00:15:45 andrei Exp $ */ 
 
 #include "php_unicode.h"
 
@@ -643,7 +643,6 @@
 
 /* }}} */
 
-
 /* {{{ Enumerator functions */
 
 static UBool php_enum_char_names(void *context,
@@ -658,18 +657,16 @@
     UBool                                      result = FALSE;
     TSRMLS_FETCH_FROM_CTX(ctx->thread_ctx);
 
-       /*
     convert_to_long_ex(ctx->args[0]);
-    convert_to_bool_ex(ctx->args[1]);
-    convert_to_string_ex(ctx->args[2]);
-       */
+    convert_to_unicode_ex(ctx->args[1]);
+    convert_to_boolean_ex(ctx->args[2]);
 
     ZVAL_LONG(*ctx->args[0], code);
-    ZVAL_BOOL(*ctx->args[1], nameChoice == U_EXTENDED_CHAR_NAME);
-       if (Z_USTRVAL_PP(ctx->args[2])) {
-               efree(Z_USTRVAL_PP(ctx->args[2]));
+       if (Z_USTRVAL_PP(ctx->args[1])) {
+               efree(Z_USTRVAL_PP(ctx->args[1]));
        }
-    ZVAL_ASCII_STRINGL(*ctx->args[2], (char *)name, length, ZSTR_DUPLICATE);
+    ZVAL_ASCII_STRINGL(*ctx->args[1], (char *)name, length, ZSTR_DUPLICATE);
+    ZVAL_BOOL(*ctx->args[2], nameChoice == U_EXTENDED_CHAR_NAME);
 
     ctx->fci.retval_ptr_ptr = &retval_ptr;
 
@@ -730,8 +727,8 @@
     ectx.fci.no_separation = 1;
     ectx.fci_cache = empty_fcall_info_cache;
     ectx.args[0] = &zcode;
-    ectx.args[1] = &zextended;
-    ectx.args[2] = &zname;
+    ectx.args[1] = &zname;
+    ectx.args[2] = &zextended;
     ectx.fci.param_count = 3;
     ectx.fci.params = ectx.args;
     TSRMLS_SET_CTX(ectx.thread_ctx);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php