[PHP-CVS] cvs: php-src /ext/standard var.c

[Marcus Boerger]

helly           Fri Jan 19 22:19:39 2007 UTC

  Modified files:              
    /php-src/ext/standard       var.c 
  Log:
  - Use Z_OBJDEBUG_PP()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.260&r2=1.261&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.260 php-src/ext/standard/var.c:1.261
--- php-src/ext/standard/var.c:1.260    Thu Jan 18 23:23:13 2007
+++ php-src/ext/standard/var.c  Fri Jan 19 22:19:39 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.260 2007/01/18 23:23:13 helly Exp $ */
+/* $Id: var.c,v 1.261 2007/01/19 22:19:39 helly Exp $ */
 
 
 
@@ -221,15 +221,7 @@
                is_temp = 0;
                goto head_done;
        case IS_OBJECT:
-               if (Z_OBJ_HANDLER_PP(struc, get_debug_info)) {
-                       myht = Z_OBJ_HANDLER_PP(struc, get_debug_info)(*struc, 
&is_temp TSRMLS_CC);
-               } else if (Z_OBJ_HANDLER_PP(struc, get_properties)) {
-                       myht = Z_OBJPROP_PP(struc);
-                       is_temp = 0;
-               } else {
-                       myht = NULL;
-                       is_temp = 0;
-               }
+               myht = Z_OBJDEBUG_PP(struc, is_temp);
                if (myht && myht->nApplyCount > 1) {
                        PUTS("*RECURSION*\n");
                        return;
@@ -430,15 +422,7 @@
                zval_element_dump_func = zval_array_element_dump;
                goto head_done;
        case IS_OBJECT:
-               if (Z_OBJ_HANDLER_PP(struc, get_debug_info)) {
-                       myht = Z_OBJ_HANDLER_PP(struc, get_debug_info)(*struc, 
&is_temp TSRMLS_CC);
-               } else if (Z_OBJ_HANDLER_PP(struc, get_properties)) {
-                       myht = Z_OBJPROP_PP(struc);
-                       is_temp = 0;
-               } else {
-                       myht = NULL;
-                       is_temp = 0;
-               }
+               myht = Z_OBJDEBUG_PP(struc, is_temp);
                if (myht && myht->nApplyCount > 1) {
                        PUTS("*RECURSION*\n");
                        return;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php