Skip to content

Commit 7584ae3

Browse files
dstogovdstogov
committed
Fixed compilaation warnings
1 parent 5864ce8 commit 7584ae3

File tree

8 files changed

+109
-122
lines changed

8 files changed

+109
-122
lines changed

‎Zend/zend_compile.c

+54-66
Large diffs are not rendered by default.

‎Zend/zend_compile.h

+46-46
Original file line numberDiff line numberDiff line change
@@ -447,44 +447,44 @@ int zend_get_zendleng(TSRMLS_D);
447447

448448

449449
/* parser-driven code generators */
450-
void zend_do_binary_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC);
451-
void zend_do_unary_op(zend_uchar op, znode *result, const znode *op1 TSRMLS_DC);
452-
void zend_do_binary_assign_op(zend_uchar op, znode *result, const znode *op1, const znode *op2 TSRMLS_DC);
450+
void zend_do_binary_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
451+
void zend_do_unary_op(zend_uchar op, znode *result, znode *op1 TSRMLS_DC);
452+
void zend_do_binary_assign_op(zend_uchar op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
453453
void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC);
454-
void zend_do_assign_ref(znode *result, const znode *lvar, const znode *rvar TSRMLS_DC);
454+
void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC);
455455
void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC);
456456
void fetch_simple_variable_ex(znode *result, znode *varname, int bp, zend_uchar op TSRMLS_DC);
457457
void zend_do_indirect_references(znode *result, const znode *num_references, znode *variable TSRMLS_DC);
458-
void zend_do_fetch_static_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC);
458+
void zend_do_fetch_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC);
459459
void zend_do_fetch_global_variable(znode *varname, const znode *static_assignment, int fetch_type TSRMLS_DC);
460460

461461
void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC);
462-
void fetch_array_dim(znode *result, const znode *parent, const znode *dim TSRMLS_DC);
463-
void fetch_string_offset(znode *result, const znode *parent, const znode *offset TSRMLS_DC);
462+
void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC);
463+
void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC);
464464
void zend_do_fetch_static_member(znode *result, znode *class_znode TSRMLS_DC);
465-
void zend_do_print(znode *result, const znode *arg TSRMLS_DC);
466-
void zend_do_echo(const znode *arg TSRMLS_DC);
465+
void zend_do_print(znode *result, znode *arg TSRMLS_DC);
466+
void zend_do_echo(znode *arg TSRMLS_DC);
467467
typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC);
468468
typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC);
469469
ZEND_API unary_op_type get_unary_op(int opcode);
470470
ZEND_API binary_op_type get_binary_op(int opcode);
471471

472-
void zend_do_while_cond(const znode *expr, znode *close_bracket_token TSRMLS_DC);
472+
void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC);
473473
void zend_do_while_end(const znode *while_token, const znode *close_bracket_token TSRMLS_DC);
474474
void zend_do_do_while_begin(TSRMLS_D);
475-
void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, const znode *expr TSRMLS_DC);
475+
void zend_do_do_while_end(const znode *do_token, const znode *expr_open_bracket, znode *expr TSRMLS_DC);
476476

477477

478-
void zend_do_if_cond(const znode *cond, znode *closing_bracket_token TSRMLS_DC);
478+
void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC);
479479
void zend_do_if_after_statement(const znode *closing_bracket_token, unsigned char initialize TSRMLS_DC);
480480
void zend_do_if_end(TSRMLS_D);
481481

482-
void zend_do_for_cond(const znode *expr, znode *second_semicolon_token TSRMLS_DC);
482+
void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC);
483483
void zend_do_for_before_statement(const znode *cond_start, const znode *second_semicolon_token TSRMLS_DC);
484484
void zend_do_for_end(const znode *second_semicolon_token TSRMLS_DC);
485485

486-
void zend_do_pre_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC);
487-
void zend_do_post_incdec(znode *result, const znode *op1, zend_uchar op TSRMLS_DC);
486+
void zend_do_pre_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC);
487+
void zend_do_post_incdec(znode *result, znode *op1, zend_uchar op TSRMLS_DC);
488488

489489
void zend_do_begin_variable_parse(TSRMLS_D);
490490
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);
493493

494494
void zend_do_free(znode *op1 TSRMLS_DC);
495495

496-
void zend_do_add_string(znode *result, const znode *op1, znode *op2 TSRMLS_DC);
497-
void zend_do_add_variable(znode *result, const znode *op1, const znode *op2 TSRMLS_DC);
496+
void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC);
497+
void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC);
498498

499499
int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier);
500500
void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC);
501501
void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC);
502-
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);
502+
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);
503503
int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC);
504504
void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC);
505-
void zend_do_clone(znode *result, const znode *expr TSRMLS_DC);
505+
void zend_do_clone(znode *result, znode *expr TSRMLS_DC);
506506
void zend_do_begin_dynamic_function_call(znode *function_name, int prefix_len TSRMLS_DC);
507507
void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC);
508508
void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member TSRMLS_DC);
509509
int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC);
510510
void zend_do_end_function_call(znode *function_name, znode *result, const znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
511511
void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
512-
void zend_do_yield(znode *result, znode *value, const znode *key, zend_bool is_variable TSRMLS_DC);
512+
void zend_do_yield(znode *result, znode *value, znode *key, zend_bool is_variable TSRMLS_DC);
513513
void zend_do_handle_exception(TSRMLS_D);
514514

515515
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);
521521
void zend_do_end_catch(znode *catch_token TSRMLS_DC);
522522
void zend_do_finally(znode *finally_token TSRMLS_DC);
523523
void zend_do_end_finally(znode *try_token, znode* catch_token, znode *finally_token TSRMLS_DC);
524-
void zend_do_throw(const znode *expr TSRMLS_DC);
524+
void zend_do_throw(znode *expr TSRMLS_DC);
525525

526526
ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable *function_table, zend_bool compile_time);
527527
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);
548548

549549

550550
void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC);
551-
void zend_do_boolean_or_end(znode *result, const znode *expr1, const znode *expr2, znode *op_token TSRMLS_DC);
551+
void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC);
552552
void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC);
553-
void zend_do_boolean_and_end(znode *result, const znode *expr1, const znode *expr2, const znode *op_token TSRMLS_DC);
553+
void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, const znode *op_token TSRMLS_DC);
554554

555-
void zend_do_brk_cont(zend_uchar op, const znode *expr TSRMLS_DC);
555+
void zend_do_brk_cont(zend_uchar op, znode *expr TSRMLS_DC);
556556

557557
void zend_do_switch_cond(const znode *cond TSRMLS_DC);
558558
void zend_do_switch_end(const znode *case_list TSRMLS_DC);
559-
void zend_do_case_before_statement(const znode *case_list, znode *case_token, const znode *case_expr TSRMLS_DC);
559+
void zend_do_case_before_statement(const znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC);
560560
void zend_do_case_after_statement(znode *result, const znode *case_token TSRMLS_DC);
561561
void zend_do_default_before_statement(const znode *case_list, znode *default_token TSRMLS_DC);
562562

563563
void zend_do_begin_class_declaration(const znode *class_token, znode *class_name, const znode *parent_class_name TSRMLS_DC);
564564
void zend_do_end_class_declaration(const znode *class_token, const znode *parent_token TSRMLS_DC);
565-
void zend_do_declare_property(znode *var_name, const znode *value, zend_uint access_type TSRMLS_DC);
566-
void zend_do_declare_class_constant(znode *var_name, const znode *value TSRMLS_DC);
565+
void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC);
566+
void zend_do_declare_class_constant(znode *var_name, znode *value TSRMLS_DC);
567567

568-
void zend_do_fetch_property(znode *result, znode *object, const znode *property TSRMLS_DC);
568+
void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC);
569569

570570
void zend_do_halt_compiler_register(TSRMLS_D);
571571

@@ -578,11 +578,11 @@ void zend_do_end_new_object(znode *result, const znode *new_token, const znode *
578578

579579
void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode, zend_bool check_namespace TSRMLS_DC);
580580

581-
void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC);
581+
void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC);
582582

583-
void zend_do_init_array(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC);
584-
void zend_do_add_array_element(znode *result, const znode *expr, const znode *offset, zend_bool is_ref TSRMLS_DC);
585-
void zend_do_add_static_array_element(znode *result, znode *offset, const znode *expr TSRMLS_DC);
583+
void zend_do_init_array(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC);
584+
void zend_do_add_array_element(znode *result, znode *expr, znode *offset, zend_bool is_ref TSRMLS_DC);
585+
void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr TSRMLS_DC);
586586
void zend_do_list_init(TSRMLS_D);
587587
void zend_do_list_end(znode *result, znode *expr TSRMLS_DC);
588588
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);
594594
void zend_add_to_list(void *result, void *item TSRMLS_DC);
595595

596596

597-
void zend_do_cast(znode *result, const znode *expr, int type TSRMLS_DC);
598-
void zend_do_include_or_eval(int type, znode *result, const znode *op1 TSRMLS_DC);
597+
void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC);
598+
void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC);
599599

600-
void zend_do_unset(const znode *variable TSRMLS_DC);
600+
void zend_do_unset(znode *variable TSRMLS_DC);
601601
void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC);
602602

603-
void zend_do_instanceof(znode *result, const znode *expr, const znode *class_znode, int type TSRMLS_DC);
603+
void zend_do_instanceof(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC);
604604

605605
void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, znode *array, znode *as_token, int variable TSRMLS_DC);
606606
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);
610610
void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC);
611611
void zend_do_declare_end(const znode *declare_token TSRMLS_DC);
612612

613-
void zend_do_exit(znode *result, const znode *message TSRMLS_DC);
613+
void zend_do_exit(znode *result, znode *message TSRMLS_DC);
614614

615615
void zend_do_begin_silence(znode *strudel_token TSRMLS_DC);
616-
void zend_do_end_silence(const znode *strudel_token TSRMLS_DC);
616+
void zend_do_end_silence(znode *strudel_token TSRMLS_DC);
617617

618-
void zend_do_jmp_set(const znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC);
619-
void zend_do_jmp_set_else(znode *result, const znode *false_value, const znode *jmp_token, const znode *colon_token TSRMLS_DC);
618+
void zend_do_jmp_set(znode *value, znode *jmp_token, znode *colon_token TSRMLS_DC);
619+
void zend_do_jmp_set_else(znode *result, znode *false_value, const znode *jmp_token, znode *colon_token TSRMLS_DC);
620620

621-
void zend_do_begin_qm_op(const znode *cond, znode *qm_token TSRMLS_DC);
622-
void zend_do_qm_true(const znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC);
623-
void zend_do_qm_false(znode *result, const znode *false_value, const znode *qm_token, const znode *colon_token TSRMLS_DC);
621+
void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC);
622+
void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC);
623+
void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, const znode *colon_token TSRMLS_DC);
624624

625625
void zend_do_extended_info(TSRMLS_D);
626626
void zend_do_extended_fcall_begin(TSRMLS_D);
@@ -632,7 +632,7 @@ void zend_do_abstract_method(const znode *function_name, znode *modifiers, const
632632

633633
void zend_do_declare_constant(znode *name, znode *value TSRMLS_DC);
634634
void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC);
635-
void zend_do_begin_namespace(const znode *name, zend_bool with_brackets TSRMLS_DC);
635+
void zend_do_begin_namespace(znode *name, zend_bool with_brackets TSRMLS_DC);
636636
void zend_do_end_namespace(TSRMLS_D);
637637
void zend_verify_namespace(TSRMLS_D);
638638
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);
645645
void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC);
646646

647647
void zend_do_label(znode *label TSRMLS_DC);
648-
void zend_do_goto(const znode *label TSRMLS_DC);
648+
void zend_do_goto(znode *label TSRMLS_DC);
649649
void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC);
650650
void zend_release_labels(int temporary TSRMLS_DC);
651651

@@ -712,7 +712,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len);
712712

713713
int zendlex(znode *zendlval TSRMLS_DC);
714714

715-
int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC);
715+
int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC);
716716

717717
/* BEGIN: OPCODES */
718718

‎ext/mbstring/mbstring.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en
692692
endp = tmpstr + value_length;
693693
n = 1;
694694
p1 = tmpstr;
695-
while ((p2 = php_memnstr(p1, ",", 1, endp)) != NULL) {
695+
while ((p2 = (char*)php_memnstr(p1, ",", 1, endp)) != NULL) {
696696
p1 = p2 + 1;
697697
n++;
698698
}
@@ -705,7 +705,7 @@ php_mb_parse_encoding_list(const char *value, size_t value_length, const mbfl_en
705705
bauto = 0;
706706
p1 = tmpstr;
707707
do {
708-
p2 = p = php_memnstr(p1, ",", 1, endp);
708+
p2 = p = (char*)php_memnstr(p1, ",", 1, endp);
709709
if (p == NULL) {
710710
p = endp;
711711
}

‎ext/session/mod_files.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ PS_CREATE_SID_FUNC(files)
464464
PS_FILES_DATA;
465465

466466
do {
467-
sid = php_session_create_id(&data TSRMLS_C);
467+
sid = php_session_create_id((void**)&data TSRMLS_C);
468468
/* Check collision */
469469
if (data && ps_files_key_exists(data, sid? sid->val : NULL TSRMLS_CC) == SUCCESS) {
470470
if (sid) {

‎ext/session/session.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */
848848

849849
ZVAL_NULL(&session_vars);
850850
PHP_VAR_UNSERIALIZE_INIT(var_hash);
851-
php_var_unserialize(&session_vars, &val, endptr, &var_hash TSRMLS_CC);
851+
php_var_unserialize(&session_vars, (const unsigned char**)&val, endptr, &var_hash TSRMLS_CC);
852852
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
853853
if (!ZVAL_IS_UNDEF(&PS(http_session_vars))) {
854854
zval_ptr_dtor(&PS(http_session_vars));

‎ext/standard/http.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
3232
zval *type, char *arg_sep, int enc_type TSRMLS_DC)
3333
{
3434
zend_string *key = NULL;
35-
char *newprefix, *p, *prop_name;
35+
char *newprefix, *p;
36+
const char *prop_name;
3637
int arg_sep_len, newprefix_len, prop_len;
3738
ulong idx;
3839
zval *zdata = NULL, copyzval;

‎ext/standard/user_filters.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,7 @@ PHP_FUNCTION(stream_bucket_new)
530530
PHP_FUNCTION(stream_get_filters)
531531
{
532532
zend_string *filter_name;
533-
int key_flags;
534533
HashTable *filters_hash;
535-
ulong num_key;
536534

537535
if (zend_parse_parameters_none() == FAILURE) {
538536
return;
@@ -543,8 +541,8 @@ PHP_FUNCTION(stream_get_filters)
543541
filters_hash = php_get_stream_filters_hash();
544542

545543
if (filters_hash) {
546-
ZEND_HASH_FOREACH_VAL(filters_hash, key_flags) {
547-
if (key_flags == HASH_KEY_IS_STRING) {
544+
ZEND_HASH_FOREACH_STR_KEY(filters_hash, filter_name) {
545+
if (filter_name) {
548546
add_next_index_str(return_value, STR_COPY(filter_name));
549547
}
550548
} ZEND_HASH_FOREACH_END();

‎main/getopt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
8080
}
8181
}
8282
if ((argv[*optind][0] == '-') && (argv[*optind][1] == '-')) {
83-
char *pos;
83+
const char *pos;
8484
int arg_end = strlen(argv[*optind])-1;
8585

8686
/* '--' indicates end of args if not followed by a known long option name */

0 commit comments

Comments
 (0)