cvs: php4 /ext/standard var.c

stas Mon Apr 21 13:03:29 2003 EDT Modified files: /php4/ext/standard var.c Log: Update to latest inteface change for get_class_name Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.159 php4/ext/standard/var.c:1.160 --- php4/ext/standard/var.c:1.159 Sat Mar 29 16:29:22 2003 +++ php4/ext/standard/var.c Mon Apr 21 13:03:29 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.159 2003/03/29 21:29:22 moriyoshi Exp $ */ +/* $Id: var.c,v 1.160 2003/04/21 17:03:29 stas Exp $ */ /* {{{ includes @@ -104,10 +104,8 @@ 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 @@ 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 @@ } 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); }