Mercurial > hg > nginx

comparison src/stream/ngx_stream_script.c @ 7271:9e25a5380a21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silenced -Wcast-function-type warnings (closes #1546). Cast to intermediate "void *" to lose compiler knowledge about the original type and pass the warning. This is not a real fix but rather a workaround. Found by gcc8.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 07 May 2018 09:54:37 +0000
parents 39ff6939266e
children b82162b8496a
comparison
equal deleted inserted replaced
7270:46c0c7ef4913 7271:9e25a5380a21
585 NULL); 585 NULL);
586 if (code == NULL) { 586 if (code == NULL) {
587 return NGX_ERROR; 587 return NGX_ERROR;
588 } 588 }
589 589
590 code->code = (ngx_stream_script_code_pt) ngx_stream_script_copy_len_code; 590 code->code = (ngx_stream_script_code_pt) (void *)
591 ngx_stream_script_copy_len_code;
591 code->len = len; 592 code->len = len;
592 593
593 size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1) 594 size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
594 & ~(sizeof(uintptr_t) - 1); 595 & ~(sizeof(uintptr_t) - 1);
595 596
675 NULL); 676 NULL);
676 if (code == NULL) { 677 if (code == NULL) {
677 return NGX_ERROR; 678 return NGX_ERROR;
678 } 679 }
679 680
680 code->code = (ngx_stream_script_code_pt) 681 code->code = (ngx_stream_script_code_pt) (void *)
681 ngx_stream_script_copy_var_len_code; 682 ngx_stream_script_copy_var_len_code;
682 code->index = (uintptr_t) index; 683 code->index = (uintptr_t) index;
683 684
684 code = ngx_stream_script_add_code(*sc->values, 685 code = ngx_stream_script_add_code(*sc->values,
685 sizeof(ngx_stream_script_var_code_t), 686 sizeof(ngx_stream_script_var_code_t),
686 &sc->main); 687 &sc->main);
765 NULL); 766 NULL);
766 if (code == NULL) { 767 if (code == NULL) {
767 return NGX_ERROR; 768 return NGX_ERROR;
768 } 769 }
769 770
770 code->code = (ngx_stream_script_code_pt) 771 code->code = (ngx_stream_script_code_pt) (void *)
771 ngx_stream_script_copy_capture_len_code; 772 ngx_stream_script_copy_capture_len_code;
772 code->n = 2 * n; 773 code->n = 2 * n;
773 774
774 775
775 code = ngx_stream_script_add_code(*sc->values, 776 code = ngx_stream_script_add_code(*sc->values,
776 sizeof(ngx_stream_script_copy_capture_code_t), 777 sizeof(ngx_stream_script_copy_capture_code_t),
857 NULL); 858 NULL);
858 if (code == NULL) { 859 if (code == NULL) {
859 return NGX_ERROR; 860 return NGX_ERROR;
860 } 861 }
861 862
862 code->code = (ngx_stream_script_code_pt) 863 code->code = (ngx_stream_script_code_pt) (void *)
863 ngx_stream_script_full_name_len_code; 864 ngx_stream_script_full_name_len_code;
864 code->conf_prefix = sc->conf_prefix; 865 code->conf_prefix = sc->conf_prefix;
865 866
866 code = ngx_stream_script_add_code(*sc->values, 867 code = ngx_stream_script_add_code(*sc->values,
867 sizeof(ngx_stream_script_full_name_code_t), &sc->main); 868 sizeof(ngx_stream_script_full_name_code_t), &sc->main);