cvs: php4 /ext/standard var.c

moriyoshi Mon Apr 21 14:00:41 2003 EDT Modified files: /php4/ext/standard var.c Log: Unified all those redundant printf's Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.160 php4/ext/standard/var.c:1.161 --- php4/ext/standard/var.c:1.160 Mon Apr 21 13:03:29 2003 +++ php4/ext/standard/var.c Mon Apr 21 14:00:41 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.160 2003/04/21 17:03:29 stas Exp $ */ +/* $Id: var.c,v 1.161 2003/04/21 18:00:41 moriyoshi Exp $ */ /* {{{ includes @@ -103,8 +103,7 @@ ce = Z_OBJCE(**struc); Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC); - php_printf("%sobject(", COMMON); - php_printf("%s)#%d (%d) {\n", class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0); + php_printf("%sobject(%s)#%d (%d) {\n", COMMON, class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0); efree(class_name); head_done: if (myht) { @@ -210,8 +209,7 @@ myht = Z_OBJPROP_PP(struc); ce = Z_OBJCE(**struc); Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC); - php_printf("%sobject(", COMMON); - 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)); + php_printf("%sobject(%s)#%d (%d) refcount(%u){\n", COMMON, 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) {