Mercurial > hg > nginx

diff 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
line wrap: on
line diff
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -686,7 +686,7 @@ ngx_stream_script_add_copy_code(ngx_stre
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt) (void *)
+    code->code = (ngx_stream_script_code_pt) (uintptr_t)
                                                ngx_stream_script_copy_len_code;
     code->len = len;
 
@@ -777,7 +777,7 @@ ngx_stream_script_add_var_code(ngx_strea
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt) (void *)
+    code->code = (ngx_stream_script_code_pt) (uintptr_t)
                                            ngx_stream_script_copy_var_len_code;
     code->index = (uintptr_t) index;
 
@@ -867,7 +867,7 @@ ngx_stream_script_add_capture_code(ngx_s
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt) (void *)
+    code->code = (ngx_stream_script_code_pt) (uintptr_t)
                                        ngx_stream_script_copy_capture_len_code;
     code->n = 2 * n;
 
@@ -959,7 +959,7 @@ ngx_stream_script_add_full_name_code(ngx
         return NGX_ERROR;
     }
 
-    code->code = (ngx_stream_script_code_pt) (void *)
+    code->code = (ngx_stream_script_code_pt) (uintptr_t)
                                           ngx_stream_script_full_name_len_code;
     code->conf_prefix = sc->conf_prefix;