cvs: ZendEngine2 / zend_execute.c

andi Thu Feb 12 10:23:06 2004 EDT Modified files: /ZendEngine2 zend_execute.c Log: - Remove old code http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.611&r2=1.612&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.611 ZendEngine2/zend_execute.c:1.612 --- ZendEngine2/zend_execute.c:1.611 Thu Feb 12 05:38:14 2004 +++ ZendEngine2/zend_execute.c Thu Feb 12 10:23:06 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.611 2004/02/12 10:38:14 zeev Exp $ */ +/* $Id: zend_execute.c,v 1.612 2004/02/12 15:23:06 andi Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -2760,24 +2760,11 @@ zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - do { - /* - if (EG(scope)) { - if (zend_hash_find(&EG(scope)->function_table, fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function) == SUCCESS) { - if ((EX(object) = EG(This))) { - EX(object)->refcount++; - } - EX(calling_scope) = EG(scope); - break; - } - } - */ - if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) { - zend_error(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); - } - EX(object) = NULL; - EX(calling_scope) = EX(function_state).function->common.scope; - } while (0); + if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) { + zend_error(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); + } + EX(object) = NULL; + EX(calling_scope) = EX(function_state).function->common.scope; FREE_OP(EX(Ts), &opline->op1, EG(free_op1));