Fix some warnings

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index ec23addf7d7112da9cb45d0b96c3b64a4e8cc93d..bd3e04026bd27c56246aab32a45c90f1b12d4d5f 100644 (file)
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -130,7 +130,7 @@
 %% /* Rules */
 
 top_statement_list:    
-               top_statement_list  { do_extended_info(CLS_C); } top_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
+               top_statement_list  { do_extended_info(CLS_C); } top_statement { HANDLE_INTERACTIVE(); }
        |       /* empty */
 ;
 
@@ -142,7 +142,7 @@ top_statement:
 
 
 inner_statement_list:
-               inner_statement_list  { do_extended_info(CLS_C); } inner_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
+               inner_statement_list  { do_extended_info(CLS_C); } inner_statement { HANDLE_INTERACTIVE(); }
        |       /* empty */
 ;
 

diff --git a/Zend/zend.c b/Zend/zend.c
index b62eec41b17ad18d6fb1f34f24f77384711d676d..83800b54e4e9ae3609570422e790ba8ebc32a82e 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -294,7 +294,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
        zend_compiler_globals *compiler_globals;
        zend_executor_globals *executor_globals;
 
-       alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), alloc_globals_ctor, NULL);
+       alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, NULL);
 #else
        start_memory_manager(ALS_C);
 #endif

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 1f267f770df94e1ef22efb65f5bb10cc51782f1b..912811eb44d1fc57f62ff88e5b83a77f9785c630 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -42,7 +42,6 @@ ZEND_API int getParameters(int ht, int param_count,...)
        va_list ptr;
        zval **param, *param_ptr;
        ELS_FETCH();
-       ALS_FETCH();
 
        p = EG(argument_stack).top_element-1;
        arg_count = (ulong) *p;

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a21c2ed16e192cea457884f78fe8a51fbf1428e9..2dd02430ab979eb53c58026798b4c06173d04f95 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -830,7 +830,6 @@ void do_begin_class_member_function_call(znode *class_name, znode *function_name
 void do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall CLS_DC)
 {
        zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
-       ELS_FETCH();
        
        if (function_name->op_type==IS_CONST && !is_method && !is_dynamic_fcall) {
                opline->opcode = ZEND_DO_FCALL;

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 5ad78d57cb4c83dd5ba055b858fe5adf7f84a836..40bea673816c60e87a66036f8fd8ce60c2f63d8b 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -314,7 +314,6 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio
        zend_function_state *original_function_state_ptr;
        zend_op_array *original_op_array;
        zend_op **original_opline_ptr;
-       CLS_FETCH();
        ELS_FETCH();
 
        if (object) {