Mercurial > hg > nginx

comparison src/stream/ngx_stream_script.c @ 9312:098019656024

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed script length code casts to work with -Wpedantic. Script length code casts though "void *", as introduced in 7271:9e25a5380a21 to silence -Wcast-function-type warnings, result in "ISO C forbids conversion of function pointer to object pointer type" warnings with -Wpedantic. Fix is to cast though uintptr_t instead.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 07 Aug 2024 03:56:38 +0300
parents 3ab8e1e2f0f7
children
comparison
equal deleted inserted replaced
9311:0ad3dde83947 9312:098019656024
684 NULL); 684 NULL);
685 if (code == NULL) { 685 if (code == NULL) {
686 return NGX_ERROR; 686 return NGX_ERROR;
687 } 687 }
688 688
689 code->code = (ngx_stream_script_code_pt) (void *) 689 code->code = (ngx_stream_script_code_pt) (uintptr_t)
690 ngx_stream_script_copy_len_code; 690 ngx_stream_script_copy_len_code;
691 code->len = len; 691 code->len = len;
692 692
693 size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1) 693 size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
694 & ~(sizeof(uintptr_t) - 1); 694 & ~(sizeof(uintptr_t) - 1);
775 NULL); 775 NULL);
776 if (code == NULL) { 776 if (code == NULL) {
777 return NGX_ERROR; 777 return NGX_ERROR;
778 } 778 }
779 779
780 code->code = (ngx_stream_script_code_pt) (void *) 780 code->code = (ngx_stream_script_code_pt) (uintptr_t)
781 ngx_stream_script_copy_var_len_code; 781 ngx_stream_script_copy_var_len_code;
782 code->index = (uintptr_t) index; 782 code->index = (uintptr_t) index;
783 783
784 code = ngx_stream_script_add_code(*sc->values, 784 code = ngx_stream_script_add_code(*sc->values,
785 sizeof(ngx_stream_script_var_code_t), 785 sizeof(ngx_stream_script_var_code_t),
865 NULL); 865 NULL);
866 if (code == NULL) { 866 if (code == NULL) {
867 return NGX_ERROR; 867 return NGX_ERROR;
868 } 868 }
869 869
870 code->code = (ngx_stream_script_code_pt) (void *) 870 code->code = (ngx_stream_script_code_pt) (uintptr_t)
871 ngx_stream_script_copy_capture_len_code; 871 ngx_stream_script_copy_capture_len_code;
872 code->n = 2 * n; 872 code->n = 2 * n;
873 873
874 874
875 code = ngx_stream_script_add_code(*sc->values, 875 code = ngx_stream_script_add_code(*sc->values,
957 NULL); 957 NULL);
958 if (code == NULL) { 958 if (code == NULL) {
959 return NGX_ERROR; 959 return NGX_ERROR;
960 } 960 }
961 961
962 code->code = (ngx_stream_script_code_pt) (void *) 962 code->code = (ngx_stream_script_code_pt) (uintptr_t)
963 ngx_stream_script_full_name_len_code; 963 ngx_stream_script_full_name_len_code;
964 code->conf_prefix = sc->conf_prefix; 964 code->conf_prefix = sc->conf_prefix;
965 965
966 code = ngx_stream_script_add_code(*sc->values, 966 code = ngx_stream_script_add_code(*sc->values,
967 sizeof(ngx_stream_script_full_name_code_t), &sc->main); 967 sizeof(ngx_stream_script_full_name_code_t), &sc->main);