diff options
| author | Stanislav Malyshev <stas@php.net> | 2003-04-21 17:03:29 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2003-04-21 17:03:29 +0000 |
| commit | 5a904d6ea81b61575462cc36bfc48b8eb711b14b (patch) | |
| tree | e0f11772de29ad5aa1bcc19971e823f3f42637f9 | |
| parent | ad01495a482dc31f56af1a4e79ff29cae2d319f2 (diff) | |
| download | php-git-5a904d6ea81b61575462cc36bfc48b8eb711b14b.tar.gz | |
Update to latest inteface change for get_class_name
| -rw-r--r-- | ext/standard/var.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index cbfdd99091..f6a05e046d 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -104,10 +104,8 @@ void php_var_dump(zval **struc, int level TSRMLS_DC) Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC); php_printf("%sobject(", COMMON); - if (ce->ns && ce->ns != &CG(global_namespace) && ce->ns->name) { - php_printf("%s::", ce->ns->name); - } php_printf("%s)#%d (%d) {\n", class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0); + efree(class_name); head_done: if (myht) { zend_hash_apply_with_arguments(myht, (apply_func_args_t) php_array_element_dump, 1, level); @@ -213,10 +211,8 @@ void php_debug_zval_dump(zval **struc, int level TSRMLS_DC) ce = Z_OBJCE(**struc); Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC); php_printf("%sobject(", COMMON); - if (ce->ns && ce->ns != &CG(global_namespace) && ce->ns->name) { - php_printf("%s::", ce->ns->name); - } php_printf("%s)#%d (%d) refcount(%u){\n", class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0, Z_REFCOUNT_PP(struc)); + efree(class_name); head_done: if (myht) { zend_hash_apply_with_arguments(myht, (apply_func_args_t) zval_array_element_dump, 1, level); @@ -346,6 +342,7 @@ void php_var_export(zval **struc, int level TSRMLS_DC) } Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC); php_printf ("class %s {\n", class_name); + efree(class_name); if (myht) { zend_hash_apply_with_arguments(myht, (apply_func_args_t) php_object_element_export, 1, level); } |