helly Mon Jul 24 18:03:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c
/php-src/ext/soap php_encoding.c
/php-src/ext/standard http.c var.c
/php-src/ext/wddx wddx.c
Log:
- MFH zend_unmangle_property_name(), drop zend_unmangle_property_name_ex()
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.13&r2=1.164.2.33.2.14&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.13
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.14
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.13 Mon Jul 10
00:18:53 2006
+++ php-src/ext/reflection/php_reflection.c Mon Jul 24 18:03:44 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.13 2006/07/10 00:18:53 helly Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.14 2006/07/24 18:03:44 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -781,7 +781,7 @@
string_printf(str, "static ");
}
- zend_unmangle_property_name(prop->name, &class_name,
&prop_name);
+ zend_unmangle_property_name(prop->name, prop->name_length,
&class_name, &prop_name);
string_printf(str, "$%s", prop_name);
}
@@ -1103,7 +1103,7 @@
property_reference *reference;
char *class_name, *prop_name;
- zend_unmangle_property_name(prop->name, &class_name, &prop_name);
+ zend_unmangle_property_name(prop->name, prop->name_length, &class_name,
&prop_name);
if (!(prop->flags & ZEND_ACC_PRIVATE)) {
/* we have to seach the class hierarchy for this (implicit)
public or protected property */
@@ -2733,7 +2733,7 @@
zend_hash_get_current_key_ex(&ce->default_properties,
&key, &key_len, &num_index, 0, &pos);
zend_hash_move_forward_ex(&ce->default_properties,
&pos);
- zend_unmangle_property_name(key, &class_name,
&prop_name);
+ zend_unmangle_property_name(key, key_len-1,
&class_name, &prop_name);
if (class_name && class_name[0] != '*' &&
strcmp(class_name, ce->name)) {
/* filter privates from base classes */
continue;
@@ -3729,7 +3729,7 @@
ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void
**) &classname, sizeof(zval *), NULL);
- zend_unmangle_property_name(property_info->name, &class_name,
&prop_name);
+ zend_unmangle_property_name(property_info->name,
property_info->name_length, &class_name, &prop_name);
MAKE_STD_ZVAL(propname);
ZVAL_STRING(propname, prop_name, 1);
zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **)
&propname, sizeof(zval *), NULL);
@@ -4768,7 +4768,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.164.2.33.2.13 2006/07/10 00:18:53 helly Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.14 2006/07/24 18:03:44 helly Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.8&r2=1.103.2.21.2.9&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.8
php-src/ext/soap/php_encoding.c:1.103.2.21.2.9
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.8 Wed Jul 12 08:59:40 2006
+++ php-src/ext/soap/php_encoding.c Mon Jul 24 18:03:44 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.8 2006/07/12 08:59:40 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.9 2006/07/24 18:03:44 helly Exp $ */
#include <time.h>
@@ -1769,7 +1769,7 @@
if (Z_TYPE_P(data) == IS_OBJECT) {
char *class_name;
-
zend_unmangle_property_name_ex(str_key, str_key_len, &class_name, &prop_name);
+
zend_unmangle_property_name(str_key, str_key_len-1, &class_name, &prop_name);
} else {
prop_name = str_key;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.14.2.4&r2=1.14.2.4.2.1&diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.14.2.4
php-src/ext/standard/http.c:1.14.2.4.2.1
--- php-src/ext/standard/http.c:1.14.2.4 Wed Mar 8 22:00:21 2006
+++ php-src/ext/standard/http.c Mon Jul 24 18:03:45 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: http.c,v 1.14.2.4 2006/03/08 22:00:21 mike Exp $ */
+/* $Id: http.c,v 1.14.2.4.2.1 2006/07/24 18:03:45 helly Exp $ */
#include "php_http.h"
#include "php_ini.h"
@@ -67,11 +67,11 @@
char *tmp;
zend_object *zobj = zend_objects_get_address(type
TSRMLS_CC);
- if (zend_check_property_access(zobj, key TSRMLS_CC) !=
SUCCESS) {
+ if (zend_check_property_access(zobj, key, key_len-1
TSRMLS_CC) != SUCCESS) {
/* private or protected property access outside
of the class */
continue;
}
- zend_unmangle_property_name_ex(key, key_len, &tmp,
&key);
+ zend_unmangle_property_name(key, key_len-1, &tmp, &key);
key_len = strlen(key);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.3&r2=1.203.2.7.2.4&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.3
php-src/ext/standard/var.c:1.203.2.7.2.4
--- php-src/ext/standard/var.c:1.203.2.7.2.3 Tue Jul 18 09:06:33 2006
+++ php-src/ext/standard/var.c Mon Jul 24 18:03:45 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.7.2.3 2006/07/18 09:06:33 dmitry Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.4 2006/07/24 18:03:45 helly Exp $ */
@@ -76,7 +76,7 @@
if (hash_key->nKeyLength ==0 ) { /* numeric key */
php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
} else { /* string key */
- zend_unmangle_property_name_ex(hash_key->arKey,
hash_key->nKeyLength, &class_name, &prop_name);
+ zend_unmangle_property_name(hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
if (class_name) {
php_printf("%*c[\"%s", level + 1, ' ', prop_name);
if (class_name[0]=='*') {
@@ -232,7 +232,7 @@
if (hash_key->nKeyLength ==0 ) { /* numeric key */
php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
} else { /* string key */
- zend_unmangle_property_name_ex(hash_key->arKey,
hash_key->nKeyLength, &class_name, &prop_name);
+ zend_unmangle_property_name(hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
if (class_name) {
php_printf("%*c[\"%s", level + 1, ' ', prop_name);
if (class_name[0]=='*') {
@@ -385,7 +385,7 @@
if (hash_key->nKeyLength != 0) {
php_printf("%*c", level + 1, ' ');
- zend_unmangle_property_name_ex(hash_key->arKey,
hash_key->nKeyLength, &class_name, &prop_name);
+ zend_unmangle_property_name(hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
php_printf(" '%s' => ", prop_name);
php_var_export(zv, level + 2 TSRMLS_CC);
PUTS (",\n");
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10.2.3&r2=1.119.2.10.2.4&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10.2.3
php-src/ext/wddx/wddx.c:1.119.2.10.2.4
--- php-src/ext/wddx/wddx.c:1.119.2.10.2.3 Tue May 30 02:40:33 2006
+++ php-src/ext/wddx/wddx.c Mon Jul 24 18:03:45 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.119.2.10.2.3 2006/05/30 02:40:33 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.10.2.4 2006/07/24 18:03:45 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -529,7 +529,7 @@
if (zend_hash_get_current_key_ex(HASH_OF(obj), &key,
&key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
char *class_name, *prop_name;
- zend_unmangle_property_name_ex(key, key_len,
&class_name, &prop_name);
+ zend_unmangle_property_name(key, key_len-1,
&class_name, &prop_name);
php_wddx_serialize_var(packet, *ent, prop_name,
strlen(prop_name)+1 TSRMLS_CC);
} else {
key_len = sprintf(tmp_buf, "%ld", idx);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
