cvs: php-src /ext/dom attr.c characterdata.c element.c node.c notation.c processinginstruction.c /ext/oci8 oci8.c oci8_interface.c oci8_statement.c
/ext/pcre php_pcre.c /ext/pdo pdo_dbh.c /ext/reflection php_reflection.c /ext/session session.c /ext/simplexml simplexml.c /ext/soap soap.c
/ext/spl php_spl.c spl_array.c spl_directory.c spl_functions.c spl_iterators.c /ext/sqlite sqlite.c /ext/standard basic_functions.c
incomplete_class.c streamsfuncs.c string.c var_unserializer.c var_unserializer.re /ext/xmlreader php_xmlreader.c ZendEngine2 zend_API.c zend_API.h
zend_builtin_functions.c zend_compile.c zend_execute_API.c zend_language_parser.y zend_language_scanner.c zend_language_scanner.l
zend_object_handlers.c zend_operators.h

felipe Mon May 25 14:32:15 2009 UTC Modified files: /ZendEngine2 zend_API.c zend_API.h zend_builtin_functions.c zend_compile.c zend_execute_API.c zend_language_parser.y zend_language_scanner.c zend_language_scanner.l zend_object_handlers.c zend_operators.h /php-src/ext/dom attr.c characterdata.c element.c node.c notation.c processinginstruction.c /php-src/ext/oci8 oci8.c oci8_interface.c oci8_statement.c /php-src/ext/pcre php_pcre.c /php-src/ext/pdo pdo_dbh.c /php-src/ext/reflection php_reflection.c /php-src/ext/session session.c /php-src/ext/simplexml simplexml.c /php-src/ext/soap soap.c /php-src/ext/spl php_spl.c spl_array.c spl_directory.c spl_functions.c spl_iterators.c /php-src/ext/sqlite sqlite.c /php-src/ext/standard basic_functions.c incomplete_class.c streamsfuncs.c string.c var_unserializer.c var_unserializer.re /php-src/ext/xmlreader php_xmlreader.c Log: - Dropped *_TEXT* macros in favor of unicode macros direct usage

http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.501&r2=1.502&diff_format=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.501 ZendEngine2/zend_API.c:1.502 --- ZendEngine2/zend_API.c:1.501 Fri May 8 11:36:35 2009 +++ ZendEngine2/zend_API.c Mon May 25 14:32:13 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.501 2009/05/08 11:36:35 scottmac Exp $ */ +/* $Id: zend_API.c,v 1.502 2009/05/25 14:32:13 felipe Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -3228,8 +3228,8 @@ zval_dtor(callable); array_init(callable); - add_next_index_text(callable, fcc.calling_scope->name, 1); - add_next_index_text(callable, fcc.function_handler->common.function_name, 1); + add_next_index_unicode(callable, fcc.calling_scope->name.u, 1); + add_next_index_unicode(callable, fcc.function_handler->common.function_name.u, 1); } if (fcc.function_handler && ((fcc.function_handler->type == ZEND_INTERNAL_FUNCTION && http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.315&r2=1.316&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.315 ZendEngine2/zend_API.h:1.316 --- ZendEngine2/zend_API.h:1.315 Mon May 25 13:11:09 2009 +++ ZendEngine2/zend_API.h Mon May 25 14:32:13 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.315 2009/05/25 13:11:09 felipe Exp $ */ +/* $Id: zend_API.h,v 1.316 2009/05/25 14:32:13 felipe Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -321,13 +321,6 @@ ZEND_API void zend_update_property_unicode(zend_class_entry *scope, zval *object, char *name, int name_length, UChar *value TSRMLS_DC); ZEND_API void zend_update_property_unicodel(zend_class_entry *scope, zval *object, char *name, int name_length, UChar *value, int value_length TSRMLS_DC); -#define zend_update_property_text(ce, obj, key, key_len, str) \ - zend_update_property_unicode(ce, obj, key, key_len, (str).u TSRMLS_CC); - -#define zend_update_property_textl(ce, obj, key, key_len, str, len) \ - zend_update_property_unicodel(ce, obj, key, key_len, str.u, len TSRMLS_CC); - - ZEND_API int zend_update_static_property(zend_class_entry *scope, char *name, int name_length, zval *value TSRMLS_DC); ZEND_API int zend_update_static_property_null(zend_class_entry *scope, char *name, int name_length TSRMLS_DC); ZEND_API int zend_update_static_property_bool(zend_class_entry *scope, char *name, int name_length, long value TSRMLS_DC); @@ -445,12 +438,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_assoc_zval_ex(arg, key, key_len, ___tmp); \ } while (0) -#define add_assoc_text_ex(arg, key, key_len, str, duplicate) do { \ - add_assoc_unicode_ex(arg, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_assoc_textl_ex(arg, key, key_len, str, length, duplicate) do { \ - add_assoc_unicodel_ex(arg, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_assoc_ascii_stringl_ex(arg, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -504,8 +491,6 @@ #define add_assoc_rt_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_rt_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate) #define add_assoc_utf8_string(__arg, __key, __str, __duplicate) add_assoc_utf8_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate) #define add_assoc_utf8_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_utf8_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate) -#define add_assoc_text(arg, key, str, duplicate) add_assoc_text_ex(arg, key, strlen(key)+1, str, duplicate) -#define add_assoc_textl(arg, key, str, length, duplicate) add_assoc_textl_ex(arg, key, strlen(key)+1, str, length, duplicate) ZEND_API int add_ascii_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value); @@ -569,12 +554,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_ascii_assoc_zval_ex(arg, key, key_len, ___tmp); \ } while (0) -#define add_ascii_assoc_text_ex(arg, key, key_len, str, duplicate) do { \ - add_ascii_assoc_unicode_ex(arg, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_ascii_assoc_textl_ex(arg, key, key_len, str, length, duplicate) do { \ - add_ascii_assoc_unicodel_ex(arg, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_ascii_assoc_ascii_stringl_ex(arg, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -629,8 +608,6 @@ #define add_ascii_assoc_rt_stringl(arg, key, str, length, flags) add_ascii_assoc_rt_stringl_ex(arg, key, strlen(key)+1, str, length, flags) #define add_ascii_assoc_utf8_string(arg, key, str, flags) add_ascii_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, strlen(str), flags) #define add_ascii_assoc_utf8_stringl(arg, key, str, length, flags) add_ascii_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, length, flags) -#define add_ascii_assoc_text(__arg, __key, __str, __duplicate) add_ascii_assoc_text_ex(__arg, __key, strlen(__key)+1, __str, __duplicate) -#define add_ascii_assoc_textl(__arg, __key, __str, __length, __duplicate) add_ascii_assoc_textl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate) ZEND_API int add_rt_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value); @@ -694,12 +671,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_rt_assoc_zval_ex(arg, key, key_len, ___tmp); \ } while (0) -#define add_rt_assoc_text_ex(arg, key, key_len, str, duplicate) do { \ - add_rt_assoc_unicode_ex(arg, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_rt_assoc_textl_ex(arg, key, key_len, str, length, duplicate) do { \ - add_rt_assoc_unicodel_ex(arg, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_rt_assoc_ascii_stringl_ex(arg, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -754,8 +725,6 @@ #define add_rt_assoc_rt_stringl(arg, key, str, length, flags) add_rt_assoc_rt_stringl_ex(arg, key, strlen(key)+1, str, length, flags) #define add_rt_assoc_utf8_string(arg, key, str, flags) add_rt_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, strlen(str), flags) #define add_rt_assoc_utf8_stringl(arg, key, str, length, flags) add_rt_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, length, flags) -#define add_rt_assoc_text(__arg, __key, __str, __duplicate) add_rt_assoc_text_ex(__arg, __key, strlen(__key)+1, __str, __duplicate) -#define add_rt_assoc_textl(__arg, __key, __str, __length, __duplicate) add_rt_assoc_textl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate) ZEND_API int add_utf8_assoc_zval_ex(zval *arg, const char *key, uint key_len, zval *value); @@ -819,12 +788,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_utf8_assoc_zval_ex(arg, key, key_len, ___tmp); \ } while (0) -#define add_utf8_assoc_text_ex(arg, key, key_len, str, duplicate) do { \ - add_utf8_assoc_unicode_ex(arg, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_utf8_assoc_textl_ex(arg, key, key_len, str, length, duplicate) do { \ - add_utf8_assoc_unicodel_ex(arg, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_utf8_assoc_ascii_stringl_ex(arg, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -879,8 +842,6 @@ #define add_utf8_assoc_rt_stringl(arg, key, str, length, flags) add_utf8_assoc_rt_stringl_ex(arg, key, strlen(key)+1, str, length, flags) #define add_utf8_assoc_utf8_string(arg, key, str, flags) add_utf8_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, strlen(str), flags) #define add_utf8_assoc_utf8_stringl(arg, key, str, length, flags) add_utf8_assoc_utf8_stringl_ex(arg, key, strlen(key)+1, str, length, flags) -#define add_utf8_assoc_text(__arg, __key, __str, __duplicate) add_utf8_assoc_text_ex(__arg, __key, strlen(__key)+1, __str, __duplicate) -#define add_utf8_assoc_textl(__arg, __key, __str, __length, __duplicate) add_utf8_assoc_textl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate) ZEND_API int add_utf8_property_zval_ex(zval *arg, char *key, uint key_len, zval *value TSRMLS_DC); @@ -954,12 +915,6 @@ add_utf8_property_zval_ex(arg, key, key_len, ___tmp TSRMLS_CC); \ zval_ptr_dtor(&___tmp); /* write_property will add 1 to refcount */ \ } while (0) -#define add_utf8_property_text_ex(arg, key, key_len, str, duplicate) do { \ - add_utf8_property_unicode_ex(arg, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_utf8_property_textl_ex(arg, key, key_len, str, length, duplicate) do { \ - add_utf8_property_unicodel_ex(arg, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_utf8_property_ascii_stringl_ex(arg, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -1053,12 +1008,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_u_assoc_zval_ex(arg, key_type, key, key_len, ___tmp); \ } while (0) -#define add_u_assoc_text_ex(arg, type, key, key_len, str, duplicate) do { \ - add_u_assoc_unicode_ex(arg, type, key, key_len, (str).u, duplicate); \ - } while (0) -#define add_u_assoc_textl_ex(arg, type, key, key_len, str, length, duplicate) do { \ - add_u_assoc_unicodel_ex(arg, type, key, key_len, (str).u, length, duplicate); \ - } while (0) #define add_u_assoc_ascii_stringl_ex(arg, type, key, key_len, str, length, flags) do { \ int ___u_len = length; \ @@ -1113,8 +1062,6 @@ #define add_u_assoc_rt_stringl(arg, key_type, key, str, length, flags) add_u_assoc_rt_stringl_ex(arg, key_type, key, ZSTR_LEN(__key_type, __key)+1, str, length, flags) #define add_u_assoc_utf8_string(arg, key_type, key, str, flags) add_u_assoc_utf8_stringl_ex(arg, key_type, key, ZSTR_LEN(__key_type, __key)+1, str, strlen(str), flags) #define add_u_assoc_utf8_stringl(arg, key_type, key, str, length, flags) add_u_assoc_utf8_stringl_ex(arg, key_type, key, ZSTR_LEN(__key_type, __key)+1, str, length, flags) -#define add_u_assoc_text(__arg, __key_type, __key, __str, __duplicate) add_u_assoc_text_ex(__arg, __key_type, __key, ZSTR_LEN(__key_type, __key)+1, __str, __duplicate) -#define add_u_assoc_textl(__arg, __key_type, __key, __str, __length, __duplicate) add_u_assoc_textl_ex(__arg, __key_type, __key, ZSTR_LEN(__key_type, __key)+1, __str, __length, __duplicate) ZEND_API int add_index_zval(zval *arg, ulong index, zval *value); @@ -1178,12 +1125,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_index_zval(arg, idx, ___tmp); \ } while (0) -#define add_index_text(arg, idx, str, duplicate) do { \ - add_index_unicode(arg, idx, (str).u, duplicate); \ - } while (0) -#define add_index_textl(arg, idx, str, length, duplicate) do { \ - add_index_unicodel(arg, idx, (str).u, length, duplicate); \ - } while (0) #define add_index_ascii_stringl(arg, idx, str, length, flags) do { \ int ___u_len = length; \ @@ -1282,12 +1223,6 @@ ZVAL_ZSTRL(___tmp, type, str, length, duplicate); \ add_next_index_zval(arg, ___tmp); \ } while (0) -#define add_next_index_text(arg, str, duplicate) do { \ - add_next_index_unicode(arg, (str).u, duplicate); \ - } while (0) -#define add_next_index_textl(arg, str, length, duplicate) do { \ - add_next_index_unicodel(arg, (str).u, length, duplicate); \ - } while (0) #define add_next_index_ascii_stringl(arg, str, length, flags) do { \ int ___u_len = length; \ @@ -1645,19 +1580,6 @@ Z_SET_REFCOUNT_P(z, refcount); \ } -#define ZVAL_TEXT(z, t, duplicate) \ - do { \ - ZVAL_UNICODE(z, t.u, duplicate); \ - } while (0); - -#define ZVAL_TEXTL(z, t, l, duplicate) \ - do { \ - ZVAL_UNICODEL(z, t.u, l, duplicate); \ - } while (0); - -#define ZVAL_EMPTY_TEXT(z) \ - ZVAL_EMPTY_UNICODE(z); - #define ZVAL_ENC_STRINGL(z, t, conv, s, l, flags) { \ if (t == IS_UNICODE) { \ char *__s = (char *)(s); \ @@ -1724,9 +1646,6 @@ #define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor) #define RETVAL_FALSE ZVAL_BOOL(return_value, 0) #define RETVAL_TRUE ZVAL_BOOL(return_value, 1) -#define RETVAL_TEXT(t, duplicate) ZVAL_TEXT(return_value, t, duplicate) -#define RETVAL_TEXTL(t, l, duplicate) ZVAL_TEXTL(return_value, t, l, duplicate) -#define RETVAL_EMPTY_TEXT() ZVAL_EMPTY_TEXT(return_value) #define RETVAL_ZSTR(type, s, duplicate) ZVAL_ZSTR(return_value, type, s, duplicate) #define RETVAL_ZSTRL(type, s, l, duplicate) ZVAL_ZSTRL(return_value, type, s, l, duplicate) #define RETVAL_ENC_STRINGL(type, conv, s, l, flags) ZVAL_ENC_STRINGL(return_value, type, conv, s, l, flags) @@ -1747,9 +1666,6 @@ #define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; } #define RETURN_FALSE { RETVAL_FALSE; return; } #define RETURN_TRUE { RETVAL_TRUE; return; } -#define RETURN_TEXT(t, duplicate) { RETVAL_TEXT(t, duplicate); return; } -#define RETURN_TEXTL(t, l, duplicate) { RETVAL_TEXTL(t, l, duplicate); return; } -#define RETURN_EMPTY_TEXT() { RETVAL_EMPTY_TEXT(); return; } #define RETURN_ASCII_STRING(t, flags) { RETVAL_ASCII_STRING(t, flags); return; } #define RETURN_ASCII_STRINGL(t, l, flags) { RETVAL_ASCII_STRINGL(t, l, flags); return; } #define RETURN_U_STRING(conv, t, flags) { RETVAL_U_STRING(conv, t, flags); return; } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.404&r2=1.405&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.404 ZendEngine2/zend_builtin_functions.c:1.405 --- ZendEngine2/zend_builtin_functions.c:1.404 Fri May 22 11:18:57 2009 +++ ZendEngine2/zend_builtin_functions.c Mon May 25 14:32:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.404 2009/05/22 11:18:57 lbarnaud Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.405 2009/05/25 14:32:13 felipe Exp $ */ #include "zend.h" #include "zend_API.h" @@ -722,7 +722,7 @@ if (!obj) { if (EG(scope)) { - RETURN_TEXTL(EG(scope)->name, EG(scope)->name_length, 1); + RETURN_UNICODEL(EG(scope)->name.u, EG(scope)->name_length, 1); } else { zend_error(E_WARNING, "get_class() called without object from outside a class"); RETURN_FALSE; @@ -731,7 +731,7 @@ dup = zend_get_object_classname(obj, &name, &name_len TSRMLS_CC); - RETURN_TEXTL(name, name_len, dup); + RETURN_UNICODEL(name.u, name_len, dup); } /* }}} */ @@ -744,7 +744,7 @@ } if (EG(called_scope)) { - RETURN_TEXTL(EG(called_scope)->name, EG(called_scope)->name_length, 1); + RETURN_UNICODEL(EG(called_scope)->name.u, EG(called_scope)->name_length, 1); } else if (!EG(scope)) { zend_error(E_WARNING, "get_called_class() called from outside a class"); } @@ -769,7 +769,7 @@ if (!ZEND_NUM_ARGS()) { ce = EG(scope); if (ce && ce->parent) { - RETURN_TEXTL(ce->parent->name, ce->parent->name_length, 1); + RETURN_UNICODEL(ce->parent->name.u, ce->parent->name_length, 1); } else { RETURN_FALSE; } @@ -778,7 +778,7 @@ if (Z_TYPE_P(arg) == IS_OBJECT) { if (Z_OBJ_HT_P(arg)->get_class_name && Z_OBJ_HT_P(arg)->get_class_name(arg, &name, &name_length, 1 TSRMLS_CC) == SUCCESS) { - RETURN_TEXTL(name, name_length, 0); + RETURN_UNICODEL(name.u, name_length, 0); } else { ce = zend_get_class_entry(arg TSRMLS_CC); } @@ -791,7 +791,7 @@ } if (ce && ce->parent) { - RETURN_TEXTL(ce->parent->name, ce->parent->name_length, 1); + RETURN_UNICODEL(ce->parent->name.u, ce->parent->name_length, 1); } else { RETURN_FALSE; } @@ -1046,7 +1046,7 @@ (zend_u_binary_strcasecmp(key.u, key_len-1, mptr->common.function_name.u, len) == 0)) { MAKE_STD_ZVAL(method_name); - ZVAL_TEXT(method_name, mptr->common.function_name, 1); + ZVAL_UNICODE(method_name, mptr->common.function_name.u, 1); zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &method_name, sizeof(zval *), NULL); } } @@ -1571,7 +1571,7 @@ (hash_key->type == IS_UNICODE && hash_key->arKey.u[0] != 0) || (hash_key->type == IS_STRING && hash_key->arKey.s[0] != 0)) && (comply_mask == (ce->ce_flags & mask))) { - add_next_index_textl(array, ce->name, ce->name_length, 1); + add_next_index_unicodel(array, ce->name.u, ce->name_length, 1); } return ZEND_HASH_APPLY_KEEP; } @@ -2227,17 +2227,17 @@ function_name = ptr->function_state.function->common.function_name; if (function_name.v) { - add_ascii_assoc_text_ex(stack_frame, "function", sizeof("function"), function_name, 1); + add_ascii_assoc_unicode_ex(stack_frame, "function", sizeof("function"), function_name.u, 1); if (ptr->object && Z_TYPE_P(ptr->object) == IS_OBJECT) { if (ptr->function_state.function->common.scope) { - add_ascii_assoc_textl_ex(stack_frame, "class", sizeof("class"), ptr->function_state.function->common.scope->name, ptr->function_state.function->common.scope->name_length, 1); + add_ascii_assoc_unicodel_ex(stack_frame, "class", sizeof("class"), ptr->function_state.function->common.scope->name.u, ptr->function_state.function->common.scope->name_length, 1); } else { zend_uint class_name_len; int dup; dup = zend_get_object_classname(ptr->object, &class_name, &class_name_len TSRMLS_CC); - add_ascii_assoc_text_ex(stack_frame, "class", sizeof("class"), class_name, dup); + add_ascii_assoc_unicode_ex(stack_frame, "class", sizeof("class"), class_name.u, dup); } if (provide_object) { add_ascii_assoc_zval_ex(stack_frame, "object", sizeof("object"), ptr->object); @@ -2246,7 +2246,7 @@ add_ascii_assoc_ascii_string_ex(stack_frame, "type", sizeof("type"), "->", 1); } else if (ptr->function_state.function->common.scope) { - add_ascii_assoc_textl_ex(stack_frame, "class", sizeof("class"), ptr->function_state.function->common.scope->name, ptr->function_state.function->common.scope->name_length, 1); + add_ascii_assoc_unicodel_ex(stack_frame, "class", sizeof("class"), ptr->function_state.function->common.scope->name.u, ptr->function_state.function->common.scope->name_length, 1); add_ascii_assoc_ascii_string_ex(stack_frame, "type", sizeof("type"), "::", 1); } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.857&r2=1.858&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.857 ZendEngine2/zend_compile.c:1.858 --- ZendEngine2/zend_compile.c:1.857 Sat May 23 18:03:26 2009 +++ ZendEngine2/zend_compile.c Mon May 25 14:32:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.857 2009/05/23 18:03:26 andrei Exp $ */ +/* $Id: zend_compile.c,v 1.858 2009/05/25 14:32:13 felipe Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -468,8 +468,8 @@ opline.result.u.EA.type = 0; opline.result.u.var = get_temporary_variable(CG(active_op_array)); opline.op1.op_type = IS_CONST; - ZVAL_TEXTL(&opline.op1.u.constant, - CG(active_op_array)->vars[result->u.var].name, + ZVAL_UNICODEL(&opline.op1.u.constant, + CG(active_op_array)->vars[result->u.var].name.u, CG(active_op_array)->vars[result->u.var].name_len, 1); SET_UNUSED(opline.op2); opline.op2 = class_node; @@ -488,8 +488,8 @@ opline.result.u.EA.type = 0; opline.result.u.var = get_temporary_variable(CG(active_op_array)); opline.op1.op_type = IS_CONST; - ZVAL_TEXTL(&opline.op1.u.constant, - CG(active_op_array)->vars[opline_ptr->op1.u.var].name, + ZVAL_UNICODEL(&opline.op1.u.constant, + CG(active_op_array)->vars[opline_ptr->op1.u.var].name.u, CG(active_op_array)->vars[opline_ptr->op1.u.var].name_len, 1); SET_UNUSED(opline.op2); opline.op2 = class_node; @@ -632,8 +632,8 @@ opline->result.u.EA.type = 0; opline->result.u.var = get_temporary_variable(CG(active_op_array)); opline->op1.op_type = IS_CONST; - ZVAL_TEXTL(&opline->op1.u.constant, - CG(active_op_array)->vars[value->u.var].name, + ZVAL_UNICODEL(&opline->op1.u.constant, + CG(active_op_array)->vars[value->u.var].name.u, CG(active_op_array)->vars[value->u.var].name_len, 1); SET_UNUSED(opline->op2); opline->op2.u.EA.type = ZEND_FETCH_LOCAL; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.477&r2=1.478&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.477 ZendEngine2/zend_execute_API.c:1.478 --- ZendEngine2/zend_execute_API.c:1.477 Wed Apr 8 13:18:15 2009 +++ ZendEngine2/zend_execute_API.c Mon May 25 14:32:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.477 2009/04/08 13:18:15 dmitry Exp $ */ +/* $Id: zend_execute_API.c,v 1.478 2009/05/25 14:32:13 felipe Exp $ */ #include <stdio.h> #include <signal.h> @@ -672,7 +672,7 @@ } } zend_error(E_NOTICE, "Use of undefined constant %v - assumed '%v'", str_index, str_index); - ZVAL_TEXTL(&const_value, str_index, str_index_len-3, 1); + ZVAL_UNICODEL(&const_value, str_index.u, str_index_len-3, 1); } if (Z_REFCOUNT_PP(element) > 1) { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.216&r2=1.217&diff_format=u Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.216 ZendEngine2/zend_language_parser.y:1.217 --- ZendEngine2/zend_language_parser.y:1.216 Thu Mar 26 20:01:38 2009 +++ ZendEngine2/zend_language_parser.y Mon May 25 14:32:13 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_parser.y,v 1.216 2009/03/26 20:01:38 felipe Exp $ */ +/* $Id: zend_language_parser.y,v 1.217 2009/05/25 14:32:13 felipe Exp $ */ /* * LALR shift/reduce conflicts and how they are resolved: @@ -677,7 +677,7 @@ namespace_name '(' { $2.u.opline_num = zend_do_begin_function_call(&$1, 1 TSRMLS_CC); } function_call_parameter_list ')' { zend_do_end_function_call(&$1, &$$, &$4, 0, $2.u.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name '(' { $1.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $4.u.opline_num = zend_do_begin_function_call(&$1, 0 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name '(' { $1.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$1.u.constant); zend_do_build_namespace_name(&$1, &$1, &$3 TSRMLS_CC); $4.u.opline_num = zend_do_begin_function_call(&$1, 0 TSRMLS_CC); } function_call_parameter_list ')' { zend_do_end_function_call(&$1, &$$, &$6, 0, $4.u.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); } | T_NS_SEPARATOR namespace_name '(' { $3.u.opline_num = zend_do_begin_function_call(&$2, 0 TSRMLS_CC); } @@ -703,14 +703,14 @@ class_name: T_STATIC { $$.op_type = IS_CONST; ZVAL_ASCII_STRINGL(&$$.u.constant, "static", sizeof("static")-1, 1);} | namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } + | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); } ; fully_qualified_class_name: namespace_name { $$ = $1; } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); } + | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); } ; @@ -745,7 +745,7 @@ ; backticks_expr: - /* empty */ { ZVAL_EMPTY_TEXT(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; } + /* empty */ { ZVAL_EMPTY_UNICODE(&$$.u.constant); INIT_PZVAL(&$$.u.constant); $$.op_type = IS_CONST; } | T_ENCAPSED_AND_WHITESPACE { $$ = $1; } | encaps_list { $$ = $1; } ; @@ -781,8 +781,8 @@ static_scalar: /* compile-time evaluated scalars */ common_scalar { $$ = $1; } | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_CT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); $2 = $$;zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_CT, 0 TSRMLS_CC); } + | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); $2 = $$;zend_do_fetch_constant(&$$, NULL, &$2, ZEND_CT, 0 TSRMLS_CC); } | '+' static_scalar { ZVAL_LONG(&$1.u.constant, 0); add_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } | '-' static_scalar { ZVAL_LONG(&$1.u.constant, 0); sub_function(&$2.u.constant, &$1.u.constant, &$2.u.constant TSRMLS_CC); $$ = $2; } | T_ARRAY '(' static_array_pair_list ')' { $$ = $3; Z_TYPE($$.u.constant) = IS_CONSTANT_ARRAY; } @@ -797,8 +797,8 @@ T_STRING_VARNAME { $$ = $1; } | class_constant { $$ = $1; } | namespace_name { zend_do_fetch_constant(&$$, NULL, &$1, ZEND_RT, 1 TSRMLS_CC); } - | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_RT, 0 TSRMLS_CC); } - | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_TEXT(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); $2 = $$; zend_do_fetch_constant(&$$, NULL, &$2, ZEND_RT, 0 TSRMLS_CC); } + | T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); $3 = $$; zend_do_fetch_constant(&$$, NULL, &$3, ZEND_RT, 0 TSRMLS_CC); } + | T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_UNICODE(&$$.u.constant); zend_do_build_full_name(NULL, &$$, &$2, 0 TSRMLS_CC); $2 = $$; zend_do_fetch_constant(&$$, NULL, &$2, ZEND_RT, 0 TSRMLS_CC); } | common_scalar { $$ = $1; } | '"' { CG(literal_type) = IS_UNICODE; } encaps_list '"' { $$ = $3; } | T_BINARY_DOUBLE { CG(literal_type) = IS_STRING; } encaps_list '"' { $$ = $3; } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.27&r2=1.28&diff_format=u Index: ZendEngine2/zend_language_scanner.c diff -u ZendEngine2/zend_language_scanner.c:1.27 ZendEngine2/zend_language_scanner.c:1.28 --- ZendEngine2/zend_language_scanner.c:1.27 Tue May 5 01:44:33 2009 +++ ZendEngine2/zend_language_scanner.c Mon May 25 14:32:13 2009 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon May 04 20:02:45 2009 */ +/* Generated by re2c 0.13.5 on Mon May 25 10:34:14 2009 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.c,v 1.27 2009/05/05 01:44:33 mattwil Exp $ */ +/* $Id: zend_language_scanner.c,v 1.28 2009/05/25 14:32:13 felipe Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -4474,7 +4474,7 @@ *zendlval = *CG(current_namespace); zval_copy_ctor(zendlval); } else { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } return T_NS_C; } @@ -4682,9 +4682,9 @@ } if (!func_name.v) { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } else { - ZVAL_TEXT(zendlval, func_name, 1); + ZVAL_UNICODE(zendlval, func_name.u, 1); } return T_FUNC_C; } @@ -4757,9 +4757,9 @@ } if (!class_name.v) { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } else { - ZVAL_TEXT(zendlval, class_name, 1); + ZVAL_UNICODE(zendlval, class_name.u, 1); } return T_CLASS_C; } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.206&r2=1.207&diff_format=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.206 ZendEngine2/zend_language_scanner.l:1.207 --- ZendEngine2/zend_language_scanner.l:1.206 Tue May 5 01:35:13 2009 +++ ZendEngine2/zend_language_scanner.l Mon May 25 14:32:13 2009 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.206 2009/05/05 01:35:13 mattwil Exp $ */ +/* $Id: zend_language_scanner.l,v 1.207 2009/05/25 14:32:13 felipe Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -1881,9 +1881,9 @@ } if (!class_name.v) { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } else { - ZVAL_TEXT(zendlval, class_name, 1); + ZVAL_UNICODE(zendlval, class_name.u, 1); } return T_CLASS_C; } @@ -1896,9 +1896,9 @@ } if (!func_name.v) { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } else { - ZVAL_TEXT(zendlval, func_name, 1); + ZVAL_UNICODE(zendlval, func_name.u, 1); } return T_FUNC_C; } @@ -1982,7 +1982,7 @@ *zendlval = *CG(current_namespace); zval_copy_ctor(zendlval); } else { - ZVAL_EMPTY_TEXT(zendlval); + ZVAL_EMPTY_UNICODE(zendlval); } return T_NS_C; } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.215&r2=1.216&diff_format=u Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.215 ZendEngine2/zend_object_handlers.c:1.216 --- ZendEngine2/zend_object_handlers.c:1.215 Tue May 12 22:50:56 2009 +++ ZendEngine2/zend_object_handlers.c Mon May 25 14:32:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.c,v 1.215 2009/05/12 22:50:56 felipe Exp $ */ +/* $Id: zend_object_handlers.c,v 1.216 2009/05/25 14:32:13 felipe Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -676,7 +676,7 @@ ALLOC_ZVAL(method_name_ptr); INIT_PZVAL(method_name_ptr); - ZVAL_TEXT(method_name_ptr, func->function_name, 0); /* no dup - it's a copy */ + ZVAL_UNICODE(method_name_ptr, func->function_name.u, 0); /* no dup - it's a copy */ /* __call handler is called with two arguments: method name @@ -895,7 +895,7 @@ ALLOC_ZVAL(method_name_ptr); INIT_PZVAL(method_name_ptr); - ZVAL_TEXT(method_name_ptr, func->function_name, 0); /* no dup - it's a copy */ + ZVAL_UNICODE(method_name_ptr, func->function_name.u, 0); /* no dup - it's a copy */ /* __callStatic handler is called with two arguments: method name http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.139&r2=1.140&diff_format=u Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.139 ZendEngine2/zend_operators.h:1.140 --- ZendEngine2/zend_operators.h:1.139 Sun May 10 22:37:30 2009 +++ ZendEngine2/zend_operators.h Mon May 25 14:32:13 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.h,v 1.139 2009/05/10 22:37:30 jani Exp $ */ +/* $Id: zend_operators.h,v 1.140 2009/05/25 14:32:13 felipe Exp $ */ #ifndef ZEND_OPERATORS_H #define ZEND_OPERATORS_H @@ -325,7 +325,6 @@ #define convert_to_string_with_converter(op, conv) _convert_to_string_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC) #define convert_to_unicode(op) _convert_to_unicode((op) TSRMLS_CC ZEND_FILE_LINE_CC) #define convert_to_unicode_with_converter(op, conv) _convert_to_unicode_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC) -#define convert_to_text(op) convert_to_unicode(op) ZEND_API double zend_string_to_double(const char *number, zend_uint length); @@ -427,7 +426,6 @@ #define convert_to_array_ex(ppzv) convert_to_ex_master(ppzv, array, ARRAY) #define convert_to_object_ex(ppzv) convert_to_ex_master(ppzv, object, OBJECT) #define convert_to_null_ex(ppzv) convert_to_ex_master(ppzv, null, NULL) -#define convert_to_text_ex(ppzv) convert_to_unicode_ex(ppzv); #define convert_to_string_with_converter_ex(ppzv, conv) \ if (Z_TYPE_PP(ppzv) != IS_STRING) { \ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.39&r2=1.40&diff_format=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.39 php-src/ext/dom/attr.c:1.40 --- php-src/ext/dom/attr.c:1.39 Fri Mar 13 13:43:57 2009 +++ php-src/ext/dom/attr.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.39 2009/03/13 13:43:57 rrichards Exp $ */ +/* $Id: attr.c,v 1.40 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -160,7 +160,7 @@ ZVAL_XML_STRING(*retval, (char *)content, ZSTR_DUPLICATE); xmlFree(content); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.32&r2=1.33&diff_format=u Index: php-src/ext/dom/characterdata.c diff -u php-src/ext/dom/characterdata.c:1.32 php-src/ext/dom/characterdata.c:1.33 --- php-src/ext/dom/characterdata.c:1.32 Tue Mar 10 23:39:12 2009 +++ php-src/ext/dom/characterdata.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: characterdata.c,v 1.32 2009/03/10 23:39:12 helly Exp $ */ +/* $Id: characterdata.c,v 1.33 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -94,7 +94,7 @@ ZVAL_XML_STRING(*retval, content, ZSTR_DUPLICATE); xmlFree(content); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; @@ -210,7 +210,7 @@ RETVAL_XML_STRING(substring, ZSTR_DUPLICATE); xmlFree(substring); } else { - RETVAL_EMPTY_TEXT(); + RETVAL_EMPTY_UNICODE(); } } /* }}} end dom_characterdata_substring_data */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.66&r2=1.67&diff_format=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.66 php-src/ext/dom/element.c:1.67 --- php-src/ext/dom/element.c:1.66 Tue Mar 10 23:39:13 2009 +++ php-src/ext/dom/element.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.66 2009/03/10 23:39:13 helly Exp $ */ +/* $Id: element.c,v 1.67 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -357,7 +357,7 @@ } if (value == NULL) { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } else { RETVAL_XML_STRING(value, ZSTR_DUPLICATE); xmlFree(value); @@ -685,10 +685,10 @@ if (nsptr != NULL) { RETVAL_XML_STRING((char *) nsptr->href, ZSTR_DUPLICATE); } else { - RETVAL_EMPTY_TEXT(); + RETVAL_EMPTY_UNICODE(); } } else { - RETVAL_EMPTY_TEXT(); + RETVAL_EMPTY_UNICODE(); } } http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.71&r2=1.72&diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.71 php-src/ext/dom/node.c:1.72 --- php-src/ext/dom/node.c:1.71 Fri Mar 13 13:43:57 2009 +++ php-src/ext/dom/node.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.71 2009/03/13 13:43:57 rrichards Exp $ */ +/* $Id: node.c,v 1.72 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -267,7 +267,7 @@ if(str != NULL) { ZVAL_XML_STRING(*retval, str, ZSTR_DUPLICATE); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } if (qname != NULL) { @@ -761,7 +761,7 @@ ALLOC_ZVAL(*retval); if (str == NULL) { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } else { ZVAL_XML_STRING(*retval, str, ZSTR_DUPLICATE); } @@ -934,7 +934,7 @@ ZVAL_XML_STRING(*retval, str, ZSTR_DUPLICATE); xmlFree(str); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/notation.c?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/dom/notation.c diff -u php-src/ext/dom/notation.c:1.18 php-src/ext/dom/notation.c:1.19 --- php-src/ext/dom/notation.c:1.18 Tue Mar 10 23:39:13 2009 +++ php-src/ext/dom/notation.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: notation.c,v 1.18 2009/03/10 23:39:13 helly Exp $ */ +/* $Id: notation.c,v 1.19 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -60,7 +60,7 @@ if (nodep->ExternalID) { ZVAL_XML_STRING(*retval, (char *) (nodep->ExternalID), ZSTR_DUPLICATE); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; @@ -88,7 +88,7 @@ if (nodep->SystemID) { ZVAL_XML_STRING(*retval, (char *) (nodep->SystemID), ZSTR_DUPLICATE); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.36&r2=1.37&diff_format=u Index: php-src/ext/dom/processinginstruction.c diff -u php-src/ext/dom/processinginstruction.c:1.36 php-src/ext/dom/processinginstruction.c:1.37 --- php-src/ext/dom/processinginstruction.c:1.36 Tue Mar 10 23:39:13 2009 +++ php-src/ext/dom/processinginstruction.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: processinginstruction.c,v 1.36 2009/03/10 23:39:13 helly Exp $ */ +/* $Id: processinginstruction.c,v 1.37 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -136,7 +136,7 @@ ZVAL_XML_STRING(*retval, content, ZSTR_DUPLICATE); xmlFree(content); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } return SUCCESS; http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.365&r2=1.366&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.365 php-src/ext/oci8/oci8.c:1.366 --- php-src/ext/oci8/oci8.c:1.365 Thu Mar 26 20:01:57 2009 +++ php-src/ext/oci8/oci8.c Mon May 25 14:32:14 2009 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.365 2009/03/26 20:01:57 felipe Exp $ */ +/* $Id: oci8.c,v 1.366 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1090,7 +1090,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", PHP_OCI8_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.365 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.366 $"); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); @@ -2220,9 +2220,9 @@ switch (lob_type) { case OCI_IS_CLOB: if (lob_length > 0) { - ZVAL_TEXTL(value, lob_buffer, TEXT_CHARS(lob_length), 0); + ZVAL_UNICODEL(value, lob_buffer.u, TEXT_CHARS(lob_length), 0); } else { - ZVAL_EMPTY_TEXT(value); + ZVAL_EMPTY_UNICODE(value); } break; case OCI_IS_BLOB: @@ -2256,7 +2256,7 @@ return 0; } - ZVAL_TEXTL(value, zstr_data, TEXT_CHARS(column_size), 1); + ZVAL_UNICODEL(value, zstr_data.u, TEXT_CHARS(column_size), 1); } return 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.44&r2=1.45&diff_format=u Index: php-src/ext/oci8/oci8_interface.c diff -u php-src/ext/oci8/oci8_interface.c:1.44 php-src/ext/oci8/oci8_interface.c:1.45 --- php-src/ext/oci8/oci8_interface.c:1.44 Thu Mar 26 20:01:57 2009 +++ php-src/ext/oci8/oci8_interface.c Mon May 25 14:32:14 2009 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_interface.c,v 1.44 2009/03/26 20:01:57 felipe Exp $ */ +/* $Id: oci8_interface.c,v 1.45 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -300,9 +300,9 @@ switch (lob_type) { case OCI_IS_CLOB: if (buffer_len > 0) { - RETURN_TEXTL(buffer, TEXT_CHARS(buffer_len), 0); + RETURN_UNICODEL(buffer.u, TEXT_CHARS(buffer_len), 0); } - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); break; case OCI_IS_BLOB: if (buffer_len > 0) { @@ -359,9 +359,9 @@ switch (lob_type) { case OCI_IS_CLOB: if (buffer_len > 0) { - RETURN_TEXTL(buffer, TEXT_CHARS(buffer_len), 0); + RETURN_UNICODEL(buffer.u, TEXT_CHARS(buffer_len), 0); } - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); break; case OCI_IS_BLOB: if (buffer_len > 0) { @@ -1151,7 +1151,7 @@ php_oci_out_column *column; if ( ( column = php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) ) ) { - RETURN_TEXTL(column->name, column->name_len, 1); + RETURN_UNICODEL(column->name.u, column->name_len, 1); } RETURN_FALSE; } @@ -1672,10 +1672,10 @@ if (errcode) { array_init(return_value); add_ascii_assoc_long(return_value, "code", errcode); - add_ascii_assoc_text(return_value, "message", ZSTR((char *)errbuf), 0); + add_ascii_assoc_unicode(return_value, "message", ZSTR((char *)errbuf).u, 0); add_ascii_assoc_long(return_value, "offset", error_offset); if (sqltext.v) { - add_ascii_assoc_text(return_value, "sqltext", sqltext, 1); + add_ascii_assoc_unicode(return_value, "sqltext", sqltext.u, 1); } else { add_ascii_assoc_ascii_string(return_value, "sqltext", "", 1); } @@ -1861,7 +1861,7 @@ RETURN_FALSE; } - RETURN_TEXT(version, 0); + RETURN_UNICODE(version.u, 0); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.63&r2=1.64&diff_format=u Index: php-src/ext/oci8/oci8_statement.c diff -u php-src/ext/oci8/oci8_statement.c:1.63 php-src/ext/oci8/oci8_statement.c:1.64 --- php-src/ext/oci8/oci8_statement.c:1.63 Thu Mar 26 20:01:57 2009 +++ php-src/ext/oci8/oci8_statement.c Mon May 25 14:32:14 2009 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8_statement.c,v 1.63 2009/03/26 20:01:57 felipe Exp $ */ +/* $Id: oci8_statement.c,v 1.64 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -857,7 +857,7 @@ } else { zstr tmp; tmp.s = (char *)buff; - ZVAL_TEXTL(*entry, tmp, TEXT_CHARS(buff_len), 1); + ZVAL_UNICODEL(*entry, tmp.u, TEXT_CHARS(buff_len), 1); } zend_hash_move_forward(hash); } else { @@ -869,7 +869,7 @@ PHP_OCI_HANDLE_ERROR(connection, connection->errcode); add_next_index_null(bind->zval); } else { - add_next_index_textl(bind->zval, tmp, TEXT_CHARS(buff_len), 1); + add_next_index_unicodel(bind->zval, tmp.u, TEXT_CHARS(buff_len), 1); } } } @@ -890,11 +890,11 @@ zval_dtor(*entry); tmp.u = ((UChar *)bind->array.elements)+TEXT_CHARS(i*bind->array.max_length); - ZVAL_TEXTL(*entry, tmp, curr_element_length, 1); + ZVAL_UNICODEL(*entry, tmp.u, curr_element_length, 1); zend_hash_move_forward(hash); } else { tmp.s = (char *)(((text *)bind->array.elements)+(i*bind->array.max_length)); - add_next_index_textl(bind->zval, tmp, curr_element_length, 1); + add_next_index_unicodel(bind->zval, tmp.u, curr_element_length, 1); } } } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.252&r2=1.253&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.252 php-src/ext/pcre/php_pcre.c:1.253 --- php-src/ext/pcre/php_pcre.c:1.252 Sat May 23 18:03:27 2009 +++ php-src/ext/pcre/php_pcre.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.252 2009/05/23 18:03:27 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.253 2009/05/25 14:32:14 felipe Exp $ */ /* TODO * php_pcre_replace_impl(): @@ -1795,7 +1795,7 @@ /* Nothing to do if we got an empty string */ if (in_str == in_str_end) { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } if (delim && *delim) { http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.169&r2=1.170&diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.169 php-src/ext/pdo/pdo_dbh.c:1.170 --- php-src/ext/pdo/pdo_dbh.c:1.169 Sat May 2 01:36:45 2009 +++ php-src/ext/pdo/pdo_dbh.c Mon May 25 14:32:14 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.169 2009/05/02 01:36:45 kalle Exp $ */ +/* $Id: pdo_dbh.c,v 1.170 2009/05/25 14:32:14 felipe Exp $ */ /* The PDO Database Handle Class */ @@ -896,7 +896,7 @@ case PDO_ATTR_STATEMENT_CLASS: array_init(return_value); - add_next_index_text(return_value, dbh->def_stmt_ce->name, 1); + add_next_index_unicode(return_value, dbh->def_stmt_ce->name.u, 1); if (dbh->def_stmt_ctor_args) { Z_ADDREF_P(dbh->def_stmt_ctor_args); add_next_index_zval(return_value, dbh->def_stmt_ctor_args); http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.344&r2=1.345&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.344 php-src/ext/reflection/php_reflection.c:1.345 --- php-src/ext/reflection/php_reflection.c:1.344 Thu May 21 16:01:22 2009 +++ php-src/ext/reflection/php_reflection.c Mon May 25 14:32:14 2009 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.344 2009/05/21 16:01:22 lbarnaud Exp $ */ +/* $Id: php_reflection.c,v 1.345 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1145,7 +1145,7 @@ zval *name; MAKE_STD_ZVAL(name); - ZVAL_TEXTL(name, ce->name, ce->name_length, 1); + ZVAL_UNICODEL(name, ce->name.u, ce->name_length, 1); reflection_instantiate(reflection_class_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); intern->ptr = ce; @@ -1193,7 +1193,7 @@ MAKE_STD_ZVAL(name); if (arg_info->name.v) { - ZVAL_TEXTL(name, arg_info->name, arg_info->name_len, 1); + ZVAL_UNICODEL(name, arg_info->name.u, arg_info->name_len, 1); } else { ZVAL_NULL(name); } @@ -1218,7 +1218,7 @@ zval *name; MAKE_STD_ZVAL(name); - ZVAL_TEXT(name, function->common.function_name, 1); + ZVAL_UNICODE(name, function->common.function_name.u, 1); reflection_instantiate(reflection_function_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); @@ -1238,7 +1238,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); - ZVAL_TEXT(name, method->common.function_name, 1); + ZVAL_UNICODE(name, method->common.function_name.u, 1); ZVAL_UNICODEL(classname, method->common.scope->name.u, method->common.scope->name_length, 1); reflection_instantiate(reflection_method_ptr, object TSRMLS_CC); @@ -1283,7 +1283,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); - ZVAL_TEXT(name, prop_name, 1); + ZVAL_UNICODE(name, prop_name.u, 1); ZVAL_UNICODEL(classname, prop->ce->name.u, prop->ce->name_length, 1); reflection_instantiate(reflection_property_ptr, object TSRMLS_CC); @@ -1534,7 +1534,7 @@ } MAKE_STD_ZVAL(name); - ZVAL_TEXT(name, fptr->common.function_name, 1); + ZVAL_UNICODE(name, fptr->common.function_name.u, 1); zend_ascii_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL); intern->ptr = fptr; intern->ref_type = REF_TYPE_FUNCTION; @@ -2151,7 +2151,7 @@ MAKE_STD_ZVAL(name); if (arg_info[position].name.v) { - ZVAL_TEXTL(name, arg_info[position].name, arg_info[position].name_len, 1); + ZVAL_UNICODEL(name, arg_info[position].name.u, arg_info[position].name_len, 1); } else { ZVAL_NULL(name); } @@ -2594,7 +2594,7 @@ ZVAL_ZSTRL(name, type, name_str, name_len, 1); } else { ZVAL_UNICODEL(classname, mptr->common.scope->name.u, mptr->common.scope->name_length, 1); - ZVAL_TEXT(name, mptr->common.function_name, 1); + ZVAL_UNICODE(name, mptr->common.function_name.u, 1); } efree(lcname.v); if (free_name_str) { @@ -2976,7 +2976,7 @@ { RETURN_UNICODEL(Z_USTRVAL_PP(name), backslash.u - Z_USTRVAL_PP(name), 1); } - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } /* }}} */ @@ -3132,7 +3132,7 @@ if (argument) { MAKE_STD_ZVAL(classname); - ZVAL_TEXTL(classname, Z_OBJCE_P(argument)->name, Z_OBJCE_P(argument)->name_length, 1); + ZVAL_UNICODEL(classname, Z_OBJCE_P(argument)->name.u, Z_OBJCE_P(argument)->name_length, 1); zend_ascii_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &classname, sizeof(zval *), NULL); intern->ptr = Z_OBJCE_P(argument); if (is_object) { @@ -3148,7 +3148,7 @@ } MAKE_STD_ZVAL(classname); - ZVAL_TEXTL(classname, (*ce)->name, (*ce)->name_length, 1); + ZVAL_UNICODEL(classname, (*ce)->name.u, (*ce)->name_length, 1); zend_ascii_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &classname, sizeof(zval *), NULL); intern->ptr = *ce; @@ -4178,7 +4178,7 @@ array_init(return_value); for (i=0; i < ce->num_interfaces; i++) { - add_next_index_textl(return_value, ce->interfaces[i]->name, ce->interfaces[i]->name_length, 1); + add_next_index_unicodel(return_value, ce->interfaces[i]->name.u, ce->interfaces[i]->name_length, 1); } } /* }}} */ @@ -4400,7 +4400,7 @@ { RETURN_UNICODEL(Z_USTRVAL_PP(name), colon.u - Z_USTRVAL_PP(name), 1); } - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } /* }}} */ @@ -4533,10 +4533,10 @@ if (dynam_prop == 0) { zend_u_unmangle_property_name(IS_UNICODE, property_info->name, property_info->name_length, &class_name, &prop_name); ZVAL_UNICODEL(classname, property_info->ce->name.u, property_info->ce->name_length, 1); - ZVAL_TEXT(propname, prop_name, 1); + ZVAL_UNICODE(propname, prop_name.u, 1); } else { ZVAL_UNICODEL(classname, ce->name.u, ce->name_length, 1); - ZVAL_TEXTL(propname, name_str, name_len, 1); + ZVAL_UNICODEL(propname, name_str.u, name_len, 1); } zend_ascii_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); zend_ascii_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL); @@ -5102,7 +5102,7 @@ zend_reflection_class_factory(*pce, zclass TSRMLS_CC); add_u_assoc_zval_ex(class_array, IS_UNICODE, (*pce)->name, (*pce)->name_length + 1, zclass); } else { - add_next_index_textl(class_array, (*pce)->name, (*pce)->name_length, 1); + add_next_index_unicodel(class_array, (*pce)->name.u, (*pce)->name_length, 1); } } return ZEND_HASH_APPLY_KEEP; @@ -5687,7 +5687,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Revision: 1.344 $"); + php_info_print_table_row(2, "Version", "$Revision: 1.345 $"); php_info_print_table_end(); } /* }}} */ @@ -5701,7 +5701,7 @@ NULL, NULL, PHP_MINFO(reflection), - "$Revision: 1.344 $", + "$Revision: 1.345 $", STANDARD_MODULE_PROPERTIES }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.503&r2=1.504&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.503 php-src/ext/session/session.c:1.504 --- php-src/ext/session/session.c:1.503 Mon May 18 16:09:51 2009 +++ php-src/ext/session/session.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.503 2009/05/18 16:09:51 jani Exp $ */ +/* $Id: session.c,v 1.504 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2190,8 +2190,8 @@ * we can compare to incomming POST variables name. zvals also allow * to keep track of length. */ ZVAL_RT_STRING(&progress->sname, PS(session_name), ZSTR_DUPLICATE); - ZVAL_TEXT(&progress->prefix, PS(rfc1867_prefix), 0); - ZVAL_TEXT(&progress->name, PS(rfc1867_name), 0); + ZVAL_UNICODE(&progress->prefix, PS(rfc1867_prefix).u, 0); + ZVAL_UNICODE(&progress->name, PS(rfc1867_name).u, 0); PS(rfc1867_progress) = progress; } @@ -2214,7 +2214,7 @@ if (USTR_EQUAL(Z_UNIVAL(progress->sname), Z_UNILEN(progress->sname), data->name, name_len)) { zval_dtor(&progress->sid); - ZVAL_TEXTL(&progress->sid, (*data->value), value_len, ZSTR_DUPLICATE); + ZVAL_UNICODEL(&progress->sid, (*data->value).u, value_len, ZSTR_DUPLICATE); convert_to_string(&progress->sid); } else if (USTR_EQUAL(Z_UNIVAL(progress->name), Z_UNILEN(progress->name), data->name, name_len)) { @@ -2224,7 +2224,7 @@ memcpy(str.s+TEXT_BYTES(Z_UNILEN(progress->prefix)), (*data->value).v, TEXT_BYTES(value_len+1)); zval_dtor(&progress->key); - ZVAL_TEXTL(&progress->key, str, len, 0); + ZVAL_UNICODEL(&progress->key, str.u, len, 0); progress->apply_trans_sid = PS(use_trans_sid); php_session_rfc1867_early_find_sid(progress TSRMLS_CC); @@ -2278,8 +2278,8 @@ ALLOC_INIT_ZVAL(progress->current_file_bytes_processed); ZVAL_LONG(progress->current_file_bytes_processed, 0); - add_ascii_assoc_text_ex(progress->current_file, "field_name", sizeof("field_name"), data->name, 1); - add_ascii_assoc_text_ex(progress->current_file, "name", sizeof("name"), *data->filename, 1); + add_ascii_assoc_unicode_ex(progress->current_file, "field_name", sizeof("field_name"), data->name.u, 1); + add_ascii_assoc_unicode_ex(progress->current_file, "name", sizeof("name"), (*data->filename).u, 1); add_ascii_assoc_null_ex(progress->current_file, "tmp_name", sizeof("tmp_name")); add_ascii_assoc_long_ex(progress->current_file, "error", sizeof("error"), 0); @@ -2315,7 +2315,7 @@ } if (data->temp_filename.v) { - add_ascii_assoc_text_ex(progress->current_file, "tmp_name", sizeof("tmp_name"), data->temp_filename, 1); + add_ascii_assoc_unicode_ex(progress->current_file, "tmp_name", sizeof("tmp_name"), data->temp_filename.u, 1); } add_ascii_assoc_long_ex(progress->current_file, "error", sizeof("error"), data->cancel_upload); add_ascii_assoc_bool_ex(progress->current_file, "done", sizeof("done"), 1); http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.275&r2=1.276&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.275 php-src/ext/simplexml/simplexml.c:1.276 --- php-src/ext/simplexml/simplexml.c:1.275 Mon Mar 30 14:21:03 2009 +++ php-src/ext/simplexml/simplexml.c Mon May 25 14:32:14 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.275 2009/03/30 14:21:03 kalle Exp $ */ +/* $Id: simplexml.c,v 1.276 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1570,7 +1570,7 @@ namelen = xmlStrlen(node->name); RETVAL_XML_STRING_LEN((char *) node->name, namelen, ZSTR_DUPLICATE); } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ @@ -1853,7 +1853,7 @@ RETURN_ZVAL(result, 1, 1); } else { zval_ptr_dtor(&result); - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ @@ -2616,7 +2616,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.275 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.276 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.263&r2=1.264&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.263 php-src/ext/soap/soap.c:1.264 --- php-src/ext/soap/soap.c:1.263 Thu Mar 26 22:16:48 2009 +++ php-src/ext/soap/soap.c Mon May 25 14:32:14 2009 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.263 2009/03/26 22:16:48 felipe Exp $ */ +/* $Id: soap.c,v 1.264 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1761,7 +1761,7 @@ zend_hash_internal_pointer_reset_ex(service->soap_functions.ft, &pos); while (zend_hash_get_current_data_ex(service->soap_functions.ft, (void **)&name, &pos) != FAILURE) { - add_next_index_text(return_value, Z_UNIVAL_PP(name), 1); + add_next_index_unicode(return_value, Z_UNIVAL_PP(name).u, 1); zend_hash_move_forward_ex(service->soap_functions.ft, &pos); } } @@ -1771,7 +1771,7 @@ zend_hash_internal_pointer_reset_ex(ft, &pos); while (zend_hash_get_current_data_ex(ft, (void **)&f, &pos) != FAILURE) { if ((service->type != SOAP_OBJECT && service->type != SOAP_CLASS) || (f->common.fn_flags & ZEND_ACC_PUBLIC)) { - add_next_index_text(return_value, f->common.function_name, 1); + add_next_index_unicode(return_value, f->common.function_name.u, 1); } zend_hash_move_forward_ex(ft, &pos); } @@ -1830,7 +1830,7 @@ } MAKE_STD_ZVAL(function_copy); - ZVAL_TEXT(function_copy, f->common.function_name, 1); + ZVAL_UNICODE(function_copy, f->common.function_name.u, 1); zend_u_hash_update(service->soap_functions.ft, Z_TYPE_PP(tmp_function), key, key_len+1, &function_copy, sizeof(zval *), NULL); efree(key.v); @@ -1855,7 +1855,7 @@ } MAKE_STD_ZVAL(function_copy); - ZVAL_TEXT(function_copy, f->common.function_name, 1); + ZVAL_UNICODE(function_copy, f->common.function_name.u, 1); zend_u_hash_update(service->soap_functions.ft, Z_TYPE_P(function_name), key, key_len+1, &function_copy, sizeof(zval *), NULL); efree(key.v); } else if (function_name->type == IS_LONG) { @@ -2115,7 +2115,7 @@ INIT_ZVAL(c_ret); INIT_ZVAL(constructor); - ZVAL_TEXT(&constructor, constructor_fn->common.function_name, 1); + ZVAL_UNICODE(&constructor, constructor_fn->common.function_name.u, 1); if (call_user_function(NULL, &tmp_soap, &constructor, &c_ret, service->soap_class.argc, service->soap_class.argv TSRMLS_CC) == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error calling constructor"); } @@ -2144,7 +2144,7 @@ INIT_ZVAL(c_ret); INIT_ZVAL(constructor); - ZVAL_TEXT(&constructor, service->soap_class.ce->name, 1); + ZVAL_UNICODE(&constructor, service->soap_class.ce->name.u, 1); if (call_user_function(NULL, &tmp_soap, &constructor, &c_ret, service->soap_class.argc, service->soap_class.argv TSRMLS_CC) == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error calling constructor"); } http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.156&r2=1.157&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.156 php-src/ext/spl/php_spl.c:1.157 --- php-src/ext/spl/php_spl.c:1.156 Sat May 2 06:27:08 2009 +++ php-src/ext/spl/php_spl.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.156 2009/05/02 06:27:08 kalle Exp $ */ +/* $Id: php_spl.c,v 1.157 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -681,12 +681,12 @@ Z_ADDREF_P(alfi->obj); add_next_index_zval(tmp, alfi->obj); } else { - add_next_index_text(tmp, alfi->ce->name, 1); + add_next_index_unicode(tmp, alfi->ce->name.u, 1); } - add_next_index_text(tmp, alfi->func_ptr->common.function_name, 1); + add_next_index_unicode(tmp, alfi->func_ptr->common.function_name.u, 1); add_next_index_zval(return_value, tmp); } else { - add_next_index_text(return_value, alfi->func_ptr->common.function_name, 1); + add_next_index_unicode(return_value, alfi->func_ptr->common.function_name.u, 1); } zend_hash_move_forward_ex(SPL_G(autoload_functions), &function_pos); @@ -695,7 +695,7 @@ } array_init(return_value); - add_next_index_text(return_value, EG(autoload_func)->common.function_name, 1); + add_next_index_unicode(return_value, EG(autoload_func)->common.function_name.u, 1); } /* }}} */ /* {{{ proto string spl_object_hash(object obj) U http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.165&r2=1.166&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.165 php-src/ext/spl/spl_array.c:1.166 --- php-src/ext/spl/spl_array.c:1.165 Thu May 21 13:25:48 2009 +++ php-src/ext/spl/spl_array.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.165 2009/05/21 13:25:48 lbarnaud Exp $ */ +/* $Id: spl_array.c,v 1.166 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1099,7 +1099,7 @@ zval *object = getThis(); spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); - RETURN_TEXTL(intern->ce_get_iterator->name, intern->ce_get_iterator->name_length, 1); + RETURN_UNICODEL(intern->ce_get_iterator->name.u, intern->ce_get_iterator->name_length, 1); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.181&r2=1.182&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.181 php-src/ext/spl/spl_directory.c:1.182 --- php-src/ext/spl/spl_directory.c:1.181 Sat May 9 21:05:18 2009 +++ php-src/ext/spl/spl_directory.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.181 2009/05/09 21:05:18 colder Exp $ */ +/* $Id: spl_directory.c,v 1.182 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1425,7 +1425,7 @@ if (intern->u.dir.sub_path.v) { RETURN_ZSTRL(intern->u.dir.sub_path_type, intern->u.dir.sub_path, intern->u.dir.sub_path_len, ZSTR_DUPLICATE); } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.c?r1=1.46&r2=1.47&diff_format=u Index: php-src/ext/spl/spl_functions.c diff -u php-src/ext/spl/spl_functions.c:1.46 php-src/ext/spl/spl_functions.c:1.47 --- php-src/ext/spl/spl_functions.c:1.46 Thu Mar 26 20:02:12 2009 +++ php-src/ext/spl/spl_functions.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_functions.c,v 1.46 2009/03/26 20:02:12 felipe Exp $ */ +/* $Id: spl_functions.c,v 1.47 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -85,7 +85,7 @@ if (zend_u_hash_find(Z_ARRVAL_P(list), IS_UNICODE, pce->name, len+1, (void*)&tmp) == FAILURE) { MAKE_STD_ZVAL(tmp); - ZVAL_TEXTL(tmp, pce->name, pce->name_length, 1); + ZVAL_UNICODEL(tmp, pce->name.u, pce->name_length, 1); zend_u_hash_add(Z_ARRVAL_P(list), IS_UNICODE, pce->name, len+1, &tmp, sizeof(zval *), NULL); } } http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.190&r2=1.191&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.190 php-src/ext/spl/spl_iterators.c:1.191 --- php-src/ext/spl/spl_iterators.c:1.190 Sat May 9 19:42:43 2009 +++ php-src/ext/spl/spl_iterators.c Mon May 25 14:32:14 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.190 2009/05/09 19:42:43 scottmac Exp $ */ +/* $Id: spl_iterators.c,v 1.191 2009/05/25 14:32:14 felipe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1236,7 +1236,7 @@ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC); - ZVAL_TEXT(&func, method, 0); + ZVAL_UNICODE(&func, method.u, 0); if (!zend_is_callable(&func, 0, &method TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Method %v::%R() does not exist", intern->inner.ce->name, Z_TYPE(method), Z_UNIVAL(method)); return FAILURE; http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.226&r2=1.227&diff_format=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.226 php-src/ext/sqlite/sqlite.c:1.227 --- php-src/ext/sqlite/sqlite.c:1.226 Thu Mar 26 20:02:28 2009 +++ php-src/ext/sqlite/sqlite.c Mon May 25 14:32:15 2009 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.226 2009/03/26 20:02:28 felipe Exp $ + $Id: sqlite.c,v 1.227 2009/05/25 14:32:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H @@ -1550,7 +1550,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.226 2009/03/26 20:02:28 felipe Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.227 2009/05/25 14:32:15 felipe Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); @@ -3358,7 +3358,7 @@ sqlite_freemem(ret); } } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.956&r2=1.957&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.956 php-src/ext/standard/basic_functions.c:1.957 --- php-src/ext/standard/basic_functions.c:1.956 Sat May 23 18:03:27 2009 +++ php-src/ext/standard/basic_functions.c Mon May 25 14:32:15 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.956 2009/05/23 18:03:27 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.957 2009/05/25 14:32:15 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -6174,7 +6174,7 @@ } } else { MAKE_STD_ZVAL(prefix); - ZVAL_EMPTY_TEXT(prefix); + ZVAL_EMPTY_UNICODE(prefix); } for (p = types; p && *p; p++) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/incomplete_class.c?r1=1.41&r2=1.42&diff_format=u Index: php-src/ext/standard/incomplete_class.c diff -u php-src/ext/standard/incomplete_class.c:1.41 php-src/ext/standard/incomplete_class.c:1.42 --- php-src/ext/standard/incomplete_class.c:1.41 Thu Mar 26 20:02:28 2009 +++ php-src/ext/standard/incomplete_class.c Mon May 25 14:32:15 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: incomplete_class.c,v 1.41 2009/03/26 20:02:28 felipe Exp $ */ +/* $Id: incomplete_class.c,v 1.42 2009/05/25 14:32:15 felipe Exp $ */ #include "php.h" #include "basic_functions.h" @@ -165,7 +165,7 @@ TSRMLS_FETCH(); MAKE_STD_ZVAL(val); - ZVAL_TEXTL(val, name, len, 1); + ZVAL_UNICODEL(val, name.u, len, 1); zend_hash_update(Z_OBJPROP_P(object), MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.138&r2=1.139&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.138 php-src/ext/standard/streamsfuncs.c:1.139 --- php-src/ext/standard/streamsfuncs.c:1.138 Sun Apr 19 17:09:46 2009 +++ php-src/ext/standard/streamsfuncs.c Mon May 25 14:32:15 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.138 2009/04/19 17:09:46 lbarnaud Exp $ */ +/* $Id: streamsfuncs.c,v 1.139 2009/05/25 14:32:15 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -125,7 +125,7 @@ } if (zerrstr) { zval_dtor(zerrstr); - ZVAL_EMPTY_TEXT(zerrstr); + ZVAL_EMPTY_UNICODE(zerrstr); } stream = php_stream_xport_create(host, host_len, REPORT_ERRORS, @@ -202,7 +202,7 @@ } if (zerrstr) { zval_dtor(zerrstr); - ZVAL_EMPTY_TEXT(zerrstr); + ZVAL_EMPTY_UNICODE(zerrstr); } stream = php_stream_xport_create(host, host_len, REPORT_ERRORS, http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.700&r2=1.701&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.700 php-src/ext/standard/string.c:1.701 --- php-src/ext/standard/string.c:1.700 Sat May 23 18:03:27 2009 +++ php-src/ext/standard/string.c Mon May 25 14:32:15 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.700 2009/05/23 18:03:27 andrei Exp $ */ +/* $Id: string.c,v 1.701 2009/05/25 14:32:15 felipe Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -3193,7 +3193,7 @@ } if (!str_len) { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } result.v = php_chunk_split(str.v, str_len, ending.v, ending_len, chunklen, &result_len, str_type); @@ -5517,7 +5517,7 @@ convert_to_unicode_ex(subject); Z_TYPE_P(result) = IS_UNICODE; if (Z_UNILEN_PP(subject) == 0) { - ZVAL_EMPTY_TEXT(result); + ZVAL_EMPTY_UNICODE(result); return; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.101&r2=1.102&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.101 php-src/ext/standard/var_unserializer.c:1.102 --- php-src/ext/standard/var_unserializer.c:1.101 Thu Mar 26 22:16:48 2009 +++ php-src/ext/standard/var_unserializer.c Mon May 25 14:32:15 2009 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.6.dev on Thu Mar 26 19:10:33 2009 */ +/* Generated by re2c 0.13.5 on Mon May 25 10:34:13 2009 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.101 2009/03/26 22:16:48 felipe Exp $ */ +/* $Id: var_unserializer.c,v 1.102 2009/05/25 14:32:15 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -667,7 +667,7 @@ ZVAL_STRING(user_func, PG(unserialize_callback_func), 1); args[0] = &arg_func_name; MAKE_STD_ZVAL(arg_func_name); - ZVAL_TEXT(arg_func_name, class_name, 1); + ZVAL_UNICODE(arg_func_name, class_name.u, 1); if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val); incomplete_class = 1; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.79&r2=1.80&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.79 php-src/ext/standard/var_unserializer.re:1.80 --- php-src/ext/standard/var_unserializer.re:1.79 Thu Mar 26 22:16:48 2009 +++ php-src/ext/standard/var_unserializer.re Mon May 25 14:32:15 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.79 2009/03/26 22:16:48 felipe Exp $ */ +/* $Id: var_unserializer.re,v 1.80 2009/05/25 14:32:15 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -749,7 +749,7 @@ ZVAL_STRING(user_func, PG(unserialize_callback_func), 1); args[0] = &arg_func_name; MAKE_STD_ZVAL(arg_func_name); - ZVAL_TEXT(arg_func_name, class_name, 1); + ZVAL_UNICODE(arg_func_name, class_name.u, 1); if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", user_func->value.str.val); incomplete_class = 1; http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.60&r2=1.61&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.60 php-src/ext/xmlreader/php_xmlreader.c:1.61 --- php-src/ext/xmlreader/php_xmlreader.c:1.60 Fri Mar 27 23:08:28 2009 +++ php-src/ext/xmlreader/php_xmlreader.c Mon May 25 14:32:15 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.60 2009/03/27 23:08:28 felipe Exp $ */ +/* $Id: php_xmlreader.c,v 1.61 2009/05/25 14:32:15 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -94,7 +94,7 @@ if (retchar) { ZVAL_XML_STRING(*retval, (char *) retchar, ZSTR_DUPLICATE); } else { - ZVAL_EMPTY_TEXT(*retval); + ZVAL_EMPTY_UNICODE(*retval); } break; case IS_BOOL: @@ -487,7 +487,7 @@ xmlFree(retchar); return; } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ @@ -612,7 +612,7 @@ xmlFree(retchar); return; } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */ @@ -647,7 +647,7 @@ xmlFree(retchar); return; } else { - RETURN_EMPTY_TEXT(); + RETURN_EMPTY_UNICODE(); } } /* }}} */