diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index a6032cd1091..12888619541 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -357,7 +357,7 @@ static inline void zend_insert_literal(zend_op_array *op_array, zval *zv, int li /* Is used while compiling a function, using the context to keep track of an approximate size to avoid to relocate to often. Literals are truncated to actual size in the second compiler pass (pass_two()). */ -int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ */ +int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { int i = op_array->last_literal; op_array->last_literal++; @@ -372,19 +372,7 @@ int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ * } /* }}} */ -/* Is used after normal compilation to append an additional literal. - Allocation is done precisely here. */ -int zend_append_individual_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ */ -{ - int i = op_array->last_literal; - op_array->last_literal++; - op_array->literals = (zval*)erealloc(op_array->literals, (i + 1) * sizeof(zval)); - zend_insert_literal(op_array, zv, i TSRMLS_CC); - return i; -} -/* }}} */ - -int zend_add_func_name_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ */ +static int zend_add_func_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { int ret; zend_string *lc_name; @@ -408,7 +396,7 @@ int zend_add_func_name_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC } /* }}} */ -int zend_add_ns_func_name_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ */ +static int zend_add_ns_func_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { int ret; zend_string *lc_name; @@ -445,7 +433,7 @@ int zend_add_ns_func_name_literal(zend_op_array *op_array, const zval *zv TSRMLS } /* }}} */ -int zend_add_class_name_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) /* {{{ */ +static int zend_add_class_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { int ret; zend_string *lc_name; @@ -476,7 +464,7 @@ int zend_add_class_name_literal(zend_op_array *op_array, const zval *zv TSRMLS_D } /* }}} */ -int zend_add_const_name_literal(zend_op_array *op_array, const zval *zv, int unqualified TSRMLS_DC) /* {{{ */ +static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int unqualified TSRMLS_DC) /* {{{ */ { int ret; char *name; @@ -585,7 +573,7 @@ static inline zend_bool zend_is_function_or_method_call(const znode *variable) / } /* }}} */ -void zend_do_binary_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC) /* {{{ */ +void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -598,7 +586,7 @@ void zend_do_binary_op(zend_uchar op, znode *result, const znode *op1, const zno } /* }}} */ -void zend_do_unary_op(zend_uchar op, znode *result, const znode *op1 TSRMLS_DC) /* {{{ */ +void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -613,7 +601,7 @@ void zend_do_unary_op(zend_uchar op, znode *result, const znode *op1 TSRMLS_DC) #define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } -static void zend_do_op_data(zend_op *data_op, const znode *value TSRMLS_DC) /* {{{ */ +static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */ { data_op->opcode = ZEND_OP_DATA; SET_NODE(data_op->op1, value); @@ -621,7 +609,7 @@ static void zend_do_op_data(zend_op *data_op, const znode *value TSRMLS_DC) /* { } /* }}} */ -void zend_do_binary_assign_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC) /* {{{ */ +void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ { int last_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -806,7 +794,7 @@ void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC } /* }}} */ -void fetch_array_dim(znode *result, const znode *parent, const znode *dim TSRMLS_DC) /* {{{ */ +void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC) /* {{{ */ { zend_op opline; zend_llist *fetch_list_ptr; @@ -846,13 +834,13 @@ void fetch_array_dim(znode *result, const znode *parent, const znode *dim TSRMLS } /* }}} */ -void fetch_string_offset(znode *result, const znode *parent, const znode *offset TSRMLS_DC) /* {{{ */ +void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC) /* {{{ */ { fetch_array_dim(result, parent, offset TSRMLS_CC); } /* }}} */ -void zend_do_print(znode *result, const znode *arg TSRMLS_DC) /* {{{ */ +void zend_do_print(znode *result, znode *arg TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -865,7 +853,7 @@ void zend_do_print(znode *result, const znode *arg TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_echo(const znode *arg TSRMLS_DC) /* {{{ */ +void zend_do_echo(znode *arg TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1024,7 +1012,7 @@ void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC) /* { } /* }}} */ -void zend_do_assign_ref(znode *result, const znode *lvar, const znode *rvar TSRMLS_DC) /* {{{ */ +void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -1091,7 +1079,7 @@ static inline void do_end_loop(int cont_addr, int has_loop_var TSRMLS_DC) /* {{{ } /* }}} */ -void zend_do_while_cond(const znode *expr, znode *close_bracket_token TSRMLS_DC) /* {{{ */ +void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC) /* {{{ */ { int while_cond_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1125,7 +1113,7 @@ void zend_do_while_end(const znode *while_token, const znode *close_bracket_toke } /* }}} */ -void zend_do_for_cond(const znode *expr, znode *second_semicolon_token TSRMLS_DC) /* {{{ */ +void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC) /* {{{ */ { int for_cond_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1169,7 +1157,7 @@ void zend_do_for_end(const znode *second_semicolon_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_pre_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ +void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ { int last_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline; @@ -1196,7 +1184,7 @@ void zend_do_pre_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC } /* }}} */ -void zend_do_post_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ +void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC) /* {{{ */ { int last_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline; @@ -1223,7 +1211,7 @@ void zend_do_post_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_D } /* }}} */ -void zend_do_if_cond(const znode *cond, znode *closing_bracket_token TSRMLS_DC) /* {{{ */ +void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC) /* {{{ */ { int if_cond_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1393,7 +1381,7 @@ void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS } /* }}} */ -void zend_do_add_string(znode *result, const znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ +void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -1426,7 +1414,7 @@ void zend_do_add_string(znode *result, const znode *op1, znode *op2 TSRMLS_DC) / } /* }}} */ -void zend_do_add_variable(znode *result, const znode *op1, const znode *op2 TSRMLS_DC) /* {{{ */ +void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -1844,7 +1832,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* } /* }}} */ -void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initialization, znode *class_type, zend_uchar pass_by_reference, zend_bool is_variadic TSRMLS_DC) /* {{{ */ +void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_uchar pass_by_reference, zend_bool is_variadic TSRMLS_DC) /* {{{ */ { zend_op *opline; zend_arg_info *cur_arg_info; @@ -2058,7 +2046,7 @@ void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_clone(znode *result, const znode *expr TSRMLS_DC) /* {{{ */ +void zend_do_clone(znode *result, znode *expr TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -2439,7 +2427,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 } /* }}} */ -void zend_do_goto(const znode *label TSRMLS_DC) /* {{{ */ +void zend_do_goto(znode *label TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -2750,7 +2738,7 @@ void zend_do_unpack_params(znode *params, int offset TSRMLS_DC) /* {{{ */ } /* }}} */ -static int generate_free_switch_expr(const zend_switch_entry *switch_entry TSRMLS_DC) /* {{{ */ +static int generate_free_switch_expr(zend_switch_entry *switch_entry TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -2847,7 +2835,7 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_variable TSRMLS_DC) /* {{{ */ +void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -3062,7 +3050,7 @@ void zend_do_end_finally(znode *try_token, znode* catch_token, znode *finally_to } /* }}} */ -void zend_do_throw(const znode *expr TSRMLS_DC) /* {{{ */ +void zend_do_throw(znode *expr TSRMLS_DC) /* {{{ */ { zend_op *opline; @@ -3870,7 +3858,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent } /* }}} */ -static zend_bool do_inherit_constant_check(HashTable *child_constants_table, const zval *parent_constant, const zend_hash_key *hash_key, const zend_class_entry *iface) /* {{{ */ +static zend_bool do_inherit_constant_check(HashTable *child_constants_table, zval *parent_constant, const zend_hash_key *hash_key, const zend_class_entry *iface) /* {{{ */ { zval *old_constant; @@ -3890,7 +3878,7 @@ static int do_interface_constant_check(zval *val TSRMLS_DC, int num_args, va_lis { zend_class_entry **iface = va_arg(args, zend_class_entry**); - do_inherit_constant_check(&(*iface)->constants_table, (const zval *) val, key, *iface); + do_inherit_constant_check(&(*iface)->constants_table, val, key, *iface); return ZEND_HASH_APPLY_KEEP; } @@ -4884,7 +4872,7 @@ void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_boolean_or_end(znode *result, const znode *expr1, const znode *expr2, znode *op_token TSRMLS_DC) /* {{{ */ +void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -4919,7 +4907,7 @@ void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC) /* {{{ * } /* }}} */ -void zend_do_boolean_and_end(znode *result, const znode *expr1, const znode *expr2, const znode *op_token TSRMLS_DC) /* {{{ */ +void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -4940,7 +4928,7 @@ void zend_do_do_while_begin(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, const znode *expr TSRMLS_DC) /* {{{ */ +void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, znode *expr TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -4955,7 +4943,7 @@ void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, } /* }}} */ -void zend_do_brk_cont(zend_uchar op, const znode *expr TSRMLS_DC) /* {{{ */ +void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -5034,7 +5022,7 @@ void zend_do_switch_end(const znode *case_list TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_case_before_statement(const znode *case_list, znode *case_token, const znode *case_expr TSRMLS_DC) /* {{{ */ +void zend_do_case_before_statement(const znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); int next_op_number; @@ -5425,7 +5413,7 @@ ZEND_API int zend_unmangle_property_name_ex(const char *mangled_property, int le } /* }}} */ -void zend_do_declare_property(znode *var_name, const znode *value, zend_uint access_type TSRMLS_DC) /* {{{ */ +void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC) /* {{{ */ { zval property; zend_property_info *existing_property_info; @@ -5468,7 +5456,7 @@ void zend_do_declare_property(znode *var_name, const znode *value, zend_uint acc } /* }}} */ -void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_DC) /* {{{ */ +void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC) /* {{{ */ { zval property; @@ -5499,7 +5487,7 @@ void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_D } /* }}} */ -void zend_do_fetch_property(znode *result, znode *object, const znode *property TSRMLS_DC) /* {{{ */ +void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC) /* {{{ */ { zend_op opline; zend_llist *fetch_list_ptr; @@ -5815,7 +5803,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con } /* }}} */ -void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */ +void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -5855,7 +5843,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_init_array(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ +void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -5888,7 +5876,7 @@ void zend_do_init_array(znode *result, const znode *expr, const znode *offset, z } /* }}} */ -void zend_do_add_array_element(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ +void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -5914,7 +5902,7 @@ void zend_do_add_array_element(znode *result, const znode *expr, const znode *of } /* }}} */ -void zend_do_add_static_array_element(znode *result, znode *offset, const znode *expr TSRMLS_DC) /* {{{ */ +void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr TSRMLS_DC) /* {{{ */ { zval element; @@ -6094,7 +6082,7 @@ void zend_add_to_list(void *result, void *item TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_fetch_static_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC) /* {{{ */ +void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC) /* {{{ */ { zval tmp; zend_op *opline; @@ -6197,7 +6185,7 @@ void zend_do_fetch_global_variable(znode *varname, const znode *static_assignmen } /* }}} */ -void zend_do_cast(znode *result, const znode *expr, int type TSRMLS_DC) /* {{{ */ +void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6211,7 +6199,7 @@ void zend_do_cast(znode *result, const znode *expr, int type TSRMLS_DC) /* {{{ * } /* }}} */ -void zend_do_include_or_eval(int type, znode *result, const znode *op1 TSRMLS_DC) /* {{{ */ +void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC) /* {{{ */ { zend_do_extended_fcall_begin(TSRMLS_C); { @@ -6248,7 +6236,7 @@ void zend_do_indirect_references(znode *result, const znode *num_references, zno } /* }}} */ -void zend_do_unset(const znode *variable TSRMLS_DC) /* {{{ */ +void zend_do_unset(znode *variable TSRMLS_DC) /* {{{ */ { zend_op *last_op; @@ -6329,7 +6317,7 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC } /* }}} */ -void zend_do_instanceof(znode *result, const znode *expr, const znode *class_znode, int type TSRMLS_DC) /* {{{ */ +void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC) /* {{{ */ { int last_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline; @@ -6611,7 +6599,7 @@ void zend_do_declare_end(const znode *declare_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_exit(znode *result, const znode *message TSRMLS_DC) /* {{{ */ +void zend_do_exit(znode *result, znode *message TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6637,7 +6625,7 @@ void zend_do_begin_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_end_silence(const znode *strudel_token TSRMLS_DC) /* {{{ */ +void zend_do_end_silence(znode *strudel_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6647,7 +6635,7 @@ void zend_do_end_silence(const znode *strudel_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_jmp_set(const znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC) /* {{{ */ +void zend_do_jmp_set(znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC) /* {{{ */ { int op_number = get_next_op_number(CG(active_op_array)); zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6671,7 +6659,7 @@ void zend_do_jmp_set(const znode *value, znode *jmp_token, znode *colon_token TS } /* }}} */ -void zend_do_jmp_set_else(znode *result, const znode *false_value, const znode *jmp_token, const znode *colon_token TSRMLS_DC) /* {{{ */ +void zend_do_jmp_set_else(znode *result, znode *false_value, const znode *jmp_token, znode *colon_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6700,7 +6688,7 @@ void zend_do_jmp_set_else(znode *result, const znode *false_value, const znode * } /* }}} */ -void zend_do_begin_qm_op(const znode *cond, znode *qm_token TSRMLS_DC) /* {{{ */ +void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC) /* {{{ */ { int jmpz_op_number = get_next_op_number(CG(active_op_array)); zend_op *opline; @@ -6717,7 +6705,7 @@ void zend_do_begin_qm_op(const znode *cond, znode *qm_token TSRMLS_DC) /* {{{ */ } /* }}} */ -void zend_do_qm_true(const znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC) /* {{{ */ +void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -6744,7 +6732,7 @@ void zend_do_qm_true(const znode *true_value, znode *qm_token, znode *colon_toke } /* }}} */ -void zend_do_qm_false(znode *result, const znode *false_value, const znode *qm_token, const znode *colon_token TSRMLS_DC) /* {{{ */ +void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, const znode *colon_token TSRMLS_DC) /* {{{ */ { zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -7039,7 +7027,7 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM } /* }}} */ -void zend_do_begin_namespace(const znode *name, zend_bool with_bracket TSRMLS_DC) /* {{{ */ +void zend_do_begin_namespace(znode *name, zend_bool with_bracket TSRMLS_DC) /* {{{ */ { char *lcname; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4b7162ec20a..833a1a04a88 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -447,44 +447,44 @@ int zend_get_zendleng(TSRMLS_D); /* parser-driven code generators */ -void zend_do_binary_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC); -void zend_do_unary_op(zend_uchar op, znode *result, const znode *op1 TSRMLS_DC); -void zend_do_binary_assign_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC); +void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC); +void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC); +void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC); void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC); -void zend_do_assign_ref(znode *result, const znode *lvar, const znode *rvar TSRMLS_DC); +void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC); void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC); void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC); void zend_do_indirect_references(znode *result, const znode *num_references, znode *variable TSRMLS_DC); -void zend_do_fetch_static_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); +void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC); void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC); void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC); -void fetch_array_dim(znode *result, const znode *parent, const znode *dim TSRMLS_DC); -void fetch_string_offset(znode *result, const znode *parent, const znode *offset TSRMLS_DC); +void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC); +void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC); void zend_do_fetch_static_member(znode *result, znode *class_znode TSRMLS_DC); -void zend_do_print(znode *result, const znode *arg TSRMLS_DC); -void zend_do_echo(const znode *arg TSRMLS_DC); +void zend_do_print(znode *result, znode *arg TSRMLS_DC); +void zend_do_echo(znode *arg TSRMLS_DC); typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC); typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC); ZEND_API unary_op_type get_unary_op(int opcode); ZEND_API binary_op_type get_binary_op(int opcode); -void zend_do_while_cond(const znode *expr, znode *close_bracket_token TSRMLS_DC); +void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC); void zend_do_while_end(const znode *while_token, const znode *close_bracket_token TSRMLS_DC); void zend_do_do_while_begin(TSRMLS_D); -void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, const znode *expr TSRMLS_DC); +void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, znode *expr TSRMLS_DC); -void zend_do_if_cond(const znode *cond, znode *closing_bracket_token TSRMLS_DC); +void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC); void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned char initialize TSRMLS_DC); void zend_do_if_end(TSRMLS_D); -void zend_do_for_cond(const znode *expr, znode *second_semicolon_token TSRMLS_DC); +void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC); void zend_do_for_before_statement(const znode *cond_start, const znode *second_semicolon_token TSRMLS_DC); void zend_do_for_end(const znode *second_semicolon_token TSRMLS_DC); -void zend_do_pre_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC); -void zend_do_post_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC); +void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC); +void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC); void zend_do_begin_variable_parse(TSRMLS_D); void zend_do_end_variable_parse(znode *variable, int type, int arg_offset TSRMLS_DC); @@ -493,23 +493,23 @@ void zend_check_writable_variable(const znode *variable); void zend_do_free(znode *op1 TSRMLS_DC); -void zend_do_add_string(znode *result, const znode *op1, znode *op2 TSRMLS_DC); -void zend_do_add_variable(znode *result, const znode *op1, const znode *op2 TSRMLS_DC); +void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC); +void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC); int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier); void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); -void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); +void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC); void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC); -void zend_do_clone(znode *result, const znode *expr TSRMLS_DC); +void zend_do_clone(znode *result, znode *expr TSRMLS_DC); void zend_do_begin_dynamic_function_call(znode *function_name, int prefix_len TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC); int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC); void zend_do_end_function_call(znode *function_name, znode *result, const znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); -void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_variable TSRMLS_DC); +void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC); void zend_do_handle_exception(TSRMLS_D); void zend_do_begin_lambda_function_declaration(znode *result, znode *function_token, int return_reference, int is_static TSRMLS_DC); @@ -521,7 +521,7 @@ void zend_do_bind_catch(znode *try_token, znode *catch_token TSRMLS_DC); void zend_do_end_catch(znode *catch_token TSRMLS_DC); void zend_do_finally(znode *finally_token TSRMLS_DC); void zend_do_end_finally(znode *try_token, znode* catch_token, znode *finally_token TSRMLS_DC); -void zend_do_throw(const znode *expr TSRMLS_DC); +void zend_do_throw(znode *expr TSRMLS_DC); ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable *function_table, zend_bool compile_time); ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const zend_op *opline, HashTable *class_table, zend_bool compile_time TSRMLS_DC); @@ -548,24 +548,24 @@ void zend_do_unpack_params(znode *params, int offset TSRMLS_DC); void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC); -void zend_do_boolean_or_end(znode *result, const znode *expr1, const znode *expr2, znode *op_token TSRMLS_DC); +void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC); void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC); -void zend_do_boolean_and_end(znode *result, const znode *expr1, const znode *expr2, const znode *op_token TSRMLS_DC); +void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC); -void zend_do_brk_cont(zend_uchar op, const znode *expr TSRMLS_DC); +void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC); void zend_do_switch_cond(const znode *cond TSRMLS_DC); void zend_do_switch_end(const znode *case_list TSRMLS_DC); -void zend_do_case_before_statement(const znode *case_list, znode *case_token, const znode *case_expr TSRMLS_DC); +void zend_do_case_before_statement(const znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC); void zend_do_case_after_statement(znode *result, const znode *case_token TSRMLS_DC); void zend_do_default_before_statement(const znode *case_list, znode *default_token TSRMLS_DC); void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC); void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC); -void zend_do_declare_property(znode *var_name, const znode *value, zend_uint access_type TSRMLS_DC); -void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_DC); +void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC); +void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC); -void zend_do_fetch_property(znode *result, znode *object, const znode *property TSRMLS_DC); +void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC); void zend_do_halt_compiler_register(TSRMLS_D); @@ -578,11 +578,11 @@ void zend_do_end_new_object(znode *result, const znode *new_token, const znode * void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC); -void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC); +void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC); -void zend_do_init_array(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC); -void zend_do_add_array_element(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC); -void zend_do_add_static_array_element(znode *result, znode *offset, const znode *expr TSRMLS_DC); +void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); +void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC); +void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr TSRMLS_DC); void zend_do_list_init(TSRMLS_D); void zend_do_list_end(znode *result, znode *expr TSRMLS_DC); void zend_do_add_list_element(const znode *element TSRMLS_DC); @@ -594,13 +594,13 @@ void zend_init_list(void *result, void *item TSRMLS_DC); void zend_add_to_list(void *result, void *item TSRMLS_DC); -void zend_do_cast(znode *result, const znode *expr, int type TSRMLS_DC); -void zend_do_include_or_eval(int type, znode *result, const znode *op1 TSRMLS_DC); +void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC); +void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC); -void zend_do_unset(const znode *variable TSRMLS_DC); +void zend_do_unset(znode *variable TSRMLS_DC); void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC); -void zend_do_instanceof(znode *result, const znode *expr, const znode *class_znode, int type TSRMLS_DC); +void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC); void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC); void zend_do_foreach_cont(znode *foreach_token, const znode *open_brackets_token, const znode *as_token, znode *value, znode *key TSRMLS_DC); @@ -610,17 +610,17 @@ void zend_do_declare_begin(TSRMLS_D); void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC); void zend_do_declare_end(const znode *declare_token TSRMLS_DC); -void zend_do_exit(znode *result, const znode *message TSRMLS_DC); +void zend_do_exit(znode *result, znode *message TSRMLS_DC); void zend_do_begin_silence(znode *strudel_token TSRMLS_DC); -void zend_do_end_silence(const znode *strudel_token TSRMLS_DC); +void zend_do_end_silence(znode *strudel_token TSRMLS_DC); -void zend_do_jmp_set(const znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC); -void zend_do_jmp_set_else(znode *result, const znode *false_value, const znode *jmp_token, const znode *colon_token TSRMLS_DC); +void zend_do_jmp_set(znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC); +void zend_do_jmp_set_else(znode *result, znode *false_value, const znode *jmp_token, znode *colon_token TSRMLS_DC); -void zend_do_begin_qm_op(const znode *cond, znode *qm_token TSRMLS_DC); -void zend_do_qm_true(const znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC); -void zend_do_qm_false(znode *result, const znode *false_value, const znode *qm_token, const znode *colon_token TSRMLS_DC); +void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC); +void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC); +void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, const znode *colon_token TSRMLS_DC); void zend_do_extended_info(TSRMLS_D); void zend_do_extended_fcall_begin(TSRMLS_D); @@ -632,7 +632,7 @@ void zend_do_abstract_method(const znode *function_name, znode *modifiers, const void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC); void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC); -void zend_do_begin_namespace(const znode *name, zend_bool with_brackets TSRMLS_DC); +void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC); void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC); @@ -645,7 +645,7 @@ void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC); void zend_do_label(znode *label TSRMLS_DC); -void zend_do_goto(const znode *label TSRMLS_DC); +void zend_do_goto(znode *label TSRMLS_DC); void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC); void zend_release_labels(int temporary TSRMLS_DC); @@ -712,7 +712,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len); int zendlex(znode *zendlval TSRMLS_DC); -int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC); +int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC); /* BEGIN: OPCODES */ diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 50827b26f35..e7aaacb01e4 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -692,7 +692,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en endp = tmpstr + value_length; n = 1; p1 = tmpstr; - while ((p2 = php_memnstr(p1, ",", 1, endp)) != NULL) { + while ((p2 = (char*)php_memnstr(p1, ",", 1, endp)) != NULL) { p1 = p2 + 1; n++; } @@ -705,7 +705,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en bauto = 0; p1 = tmpstr; do { - p2 = p = php_memnstr(p1, ",", 1, endp); + p2 = p = (char*)php_memnstr(p1, ",", 1, endp); if (p == NULL) { p = endp; } diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index ddfb62ab6c7..ec16f8bbb85 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -464,7 +464,7 @@ PS_CREATE_SID_FUNC(files) PS_FILES_DATA; do { - sid = php_session_create_id(&data TSRMLS_C); + sid = php_session_create_id((void**)&data TSRMLS_C); /* Check collision */ if (data && ps_files_key_exists(data, sid? sid->val : NULL TSRMLS_CC) == SUCCESS) { if (sid) { diff --git a/ext/session/session.c b/ext/session/session.c index e7113c08cba..6982449af47 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -848,7 +848,7 @@ PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */ ZVAL_NULL(&session_vars); PHP_VAR_UNSERIALIZE_INIT(var_hash); - php_var_unserialize(&session_vars, &val, endptr, &var_hash TSRMLS_CC); + php_var_unserialize(&session_vars, (const unsigned char**)&val, endptr, &var_hash TSRMLS_CC); PHP_VAR_UNSERIALIZE_DESTROY(var_hash); if (!ZVAL_IS_UNDEF(&PS(http_session_vars))) { zval_ptr_dtor(&PS(http_session_vars)); diff --git a/ext/standard/http.c b/ext/standard/http.c index 14d73779a4f..fbda5ccc9e5 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -32,7 +32,8 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, zval *type, char *arg_sep, int enc_type TSRMLS_DC) { zend_string *key = NULL; - char *newprefix, *p, *prop_name; + char *newprefix, *p; + const char *prop_name; int arg_sep_len, newprefix_len, prop_len; ulong idx; zval *zdata = NULL, copyzval; diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index b0811d8c4f7..e55c05b953e 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -530,9 +530,7 @@ PHP_FUNCTION(stream_bucket_new) PHP_FUNCTION(stream_get_filters) { zend_string *filter_name; - int key_flags; HashTable *filters_hash; - ulong num_key; if (zend_parse_parameters_none() == FAILURE) { return; @@ -543,8 +541,8 @@ PHP_FUNCTION(stream_get_filters) filters_hash = php_get_stream_filters_hash(); if (filters_hash) { - ZEND_HASH_FOREACH_VAL(filters_hash, key_flags) { - if (key_flags == HASH_KEY_IS_STRING) { + ZEND_HASH_FOREACH_STR_KEY(filters_hash, filter_name) { + if (filter_name) { add_next_index_str(return_value, STR_COPY(filter_name)); } } ZEND_HASH_FOREACH_END(); diff --git a/main/getopt.c b/main/getopt.c index a31a6c75d58..315467a0952 100644 --- a/main/getopt.c +++ b/main/getopt.c @@ -80,7 +80,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char } } if ((argv[*optind][0] == '-') && (argv[*optind][1] == '-')) { - char *pos; + const char *pos; int arg_end = strlen(argv[*optind])-1; /* '--' indicates end of args if not followed by a known long option name */