helly           Tue Dec 19 21:13:21 2006 UTC

  Modified files:              
    /php-src/ext/standard       array.c 
    /php-src/ext/reflection     php_reflection.c 
    /php-src    README.UNICODE-UPGRADES 
  Log:
  - Fix ZVAL_ZSTRL
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.398&r2=1.399&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.398 php-src/ext/standard/array.c:1.399
--- php-src/ext/standard/array.c:1.398  Tue Dec 19 08:02:48 2006
+++ php-src/ext/standard/array.c        Tue Dec 19 21:13:21 2006
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.398 2006/12/19 08:02:48 shire Exp $ */
+/* $Id: array.c,v 1.399 2006/12/19 21:13:21 helly Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1436,7 +1436,7 @@
                                        break;
                                }
                        
-                               ZVAL_ZSTRL(&final_name, var_name, var_name_len, 
key_type, 1);
+                               ZVAL_ZSTRL(&final_name, var_name, key_type, 
var_name_len, 1);
                                break;
 
                        case EXTR_PREFIX_IF_EXISTS:
@@ -1447,7 +1447,7 @@
 
                        case EXTR_PREFIX_SAME:
                                if (!var_exists && var_name_len != 0) {
-                                       ZVAL_ZSTRL(&final_name, var_name, 
var_name_len, key_type, 1);
+                                       ZVAL_ZSTRL(&final_name, var_name, 
key_type, var_name_len, 1);
                                }
                                /* break omitted intentionally */
 
@@ -1462,14 +1462,14 @@
                                        if (!php_valid_var_name(var_name, 
var_name_len, key_type)) {
                                                php_prefix_varname(&final_name, 
prefix, var_name, var_name_len, key_type, 1 TSRMLS_CC);
                                        } else {
-                                               ZVAL_ZSTRL(&final_name, 
var_name, var_name_len, key_type, 1);
+                                               ZVAL_ZSTRL(&final_name, 
var_name, key_type, var_name_len, 1);
                                        }
                                }
                                break;
 
                        default:
                                if (!var_exists) {
-                                       ZVAL_ZSTRL(&final_name, var_name, 
var_name_len, key_type, 1);
+                                       ZVAL_ZSTRL(&final_name, var_name, 
key_type, var_name_len, 1);
                                }
                                break;
                }
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.266&r2=1.267&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.266 
php-src/ext/reflection/php_reflection.c:1.267
--- php-src/ext/reflection/php_reflection.c:1.266       Fri Oct 27 21:22:05 2006
+++ php-src/ext/reflection/php_reflection.c     Tue Dec 19 21:13:21 2006
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_reflection.c,v 1.266 2006/10/27 21:22:05 andrei Exp $ */
+/* $Id: php_reflection.c,v 1.267 2006/12/19 21:13:21 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2190,7 +2190,7 @@
                } else {
                        tmp_len = tmp.s - name_str.s;
                }
-               ZVAL_ZSTRL(classname, name_str, tmp_len, type, 1);
+               ZVAL_ZSTRL(classname, name_str, type, tmp_len, 1);
                name_len = name_len - (tmp_len + 2);
                if (type == IS_UNICODE) {
                        name_str.u = tmp.u + 2;
@@ -4948,7 +4948,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "Reflection", "enabled");
 
-       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.266 
2006/10/27 21:22:05 andrei Exp $");
+       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.267 
2006/12/19 21:13:21 helly Exp $");
 
        php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE-UPGRADES?r1=1.11&r2=1.12&diff_format=u
Index: php-src/README.UNICODE-UPGRADES
diff -u php-src/README.UNICODE-UPGRADES:1.11 
php-src/README.UNICODE-UPGRADES:1.12
--- php-src/README.UNICODE-UPGRADES:1.11        Tue Oct 17 21:57:22 2006
+++ php-src/README.UNICODE-UPGRADES     Tue Dec 19 21:13:21 2006
@@ -100,7 +100,7 @@
    for 'dup' does not matter, but ZSTR_AUTOFREE will be used will be used to
    efree the original value
 
-ZVAL_ZSTR(pzv, zstr, type, dup), ZVAL_ZSTRL(pzv, zstr, zstr_len, type, dup)
+ZVAL_ZSTR(pzv, zstr, type, dup), ZVAL_ZSTRL(pzv, zstr, type, zstr_len, dup)
  - This macro uses 'type' to switch between calling ZVAL_STRING(pzv, zstr.s, 
dup)
    and ZVAL_UNICODE(pzv, zstr.u, dup).  No conversion happens so the
    presense of absense of ZSTR_AUTOFREE is ignored.

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

Reply via email to