Compilation warnings

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 51ed50a33761f3bfed3662fb7d71820fc9bcd68e..80565e12aff87667c51c4e14da69584a48bc8322 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1323,8 +1323,6 @@ ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_v
 #define ZEND_VM_CONTINUE_JMP() \
      ZEND_VM_CONTINUE()    
 
-static int zend_vm_old_executor = 0;
-
 #include "zend_vm_execute.h"
 
 ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, opcode_handler_t handler)

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 6ed7cacc221aa697bcda952bf3fa064b3f5587d0..09434f88e74eee764a797013d25b73af3442a450 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2905,7 +2905,6 @@ ZEND_VM_HANDLER(76, ZEND_UNSET_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
        zend_free_op free_op1, free_op2;
        zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
        zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
-       long index;
 
        if (container) {
                if (OP1_TYPE == IS_CV && container != &EG(uninitialized_zval_ptr)) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 108f244e51b86e64370dec13aa1071c40bf79240..89053d3dac20e31541cde681a7be3664ee337dbc 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -8978,7 +8978,6 @@ static int ZEND_UNSET_OBJ_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op1;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = &opline->op2.u.constant;
-       long index;
 
        if (container) {
                if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -10397,7 +10396,6 @@ static int ZEND_UNSET_OBJ_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op1, free_op2;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -11850,7 +11848,6 @@ static int ZEND_UNSET_OBJ_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op1, free_op2;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -13675,7 +13672,6 @@ static int ZEND_UNSET_OBJ_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op1;
        zval **container = _get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_VAR == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -14832,7 +14828,6 @@ static int ZEND_UNSET_OBJ_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = &opline->op2.u.constant;
-       long index;
 
        if (container) {
                if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -15872,7 +15867,6 @@ static int ZEND_UNSET_OBJ_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op2;
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -16912,7 +16906,6 @@ static int ZEND_UNSET_OBJ_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op2;
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -18314,7 +18307,6 @@ static int ZEND_UNSET_OBJ_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        
        zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_UNUSED == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -20849,7 +20841,6 @@ static int ZEND_UNSET_OBJ_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = &opline->op2.u.constant;
-       long index;
 
        if (container) {
                if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -22260,7 +22251,6 @@ static int ZEND_UNSET_OBJ_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op2;
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -23704,7 +23694,6 @@ static int ZEND_UNSET_OBJ_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_free_op free_op2;
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {
@@ -25519,7 +25508,6 @@ static int ZEND_UNSET_OBJ_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        
        zval **container = _get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), BP_VAR_UNSET TSRMLS_CC);
        zval *offset = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
-       long index;
 
        if (container) {
                if (IS_CV == IS_CV && container != &EG(uninitialized_zval_ptr)) {