dmitry                                   Fri, 22 Oct 2010 09:56:39 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=304609

Log:
Removed redundant check

Changed paths:
    U   php/php-src/trunk/Zend/zend_vm_def.h
    U   php/php-src/trunk/Zend/zend_vm_execute.h

Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h        2010-10-22 09:53:29 UTC (rev 
304608)
+++ php/php-src/trunk/Zend/zend_vm_def.h        2010-10-22 09:56:39 UTC (rev 
304609)
@@ -4831,9 +4831,7 @@
                if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
                        /* further blocks will not be relevant... */
                        break;
-               }
-               if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-                       && op_num < 
EG(active_op_array)->try_catch_array[i].catch_op) {
+               } else if (op_num < 
EG(active_op_array)->try_catch_array[i].catch_op) {
                        catch_op_num = 
EX(op_array)->try_catch_array[i].catch_op;
                        catched = 1;
                }

Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h    2010-10-22 09:53:29 UTC (rev 
304608)
+++ php/php-src/trunk/Zend/zend_vm_execute.h    2010-10-22 09:56:39 UTC (rev 
304609)
@@ -1043,9 +1043,7 @@
                if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
                        /* further blocks will not be relevant... */
                        break;
-               }
-               if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-                       && op_num < 
EG(active_op_array)->try_catch_array[i].catch_op) {
+               } else if (op_num < 
EG(active_op_array)->try_catch_array[i].catch_op) {
                        catch_op_num = 
EX(op_array)->try_catch_array[i].catch_op;
                        catched = 1;
                }

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

Reply via email to