Skip to content

Commit c4c4328

Browse files
committed
style: fixed coding style.
1 parent 825bc31 commit c4c4328

File tree

2 files changed

+25
-30
lines changed

2 files changed

+25
-30
lines changed

src/ngx_stream_lua_common.h

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -284,33 +284,19 @@ struct ngx_stream_lua_srv_conf_s {
284284
code cache */
285285

286286
ngx_stream_lua_handler_pt preread_handler;
287+
u_char *preread_chunkname;
288+
ngx_stream_complex_value_t preread_src;
289+
u_char *preread_src_key;
287290

288291
ngx_stream_lua_handler_pt content_handler;
289-
ngx_stream_lua_handler_pt log_handler;
290-
291-
u_char *preread_chunkname;
292-
ngx_stream_complex_value_t preread_src; /* access_by_lua
293-
inline script/script
294-
file path */
295-
296-
u_char *preread_src_key; /* cached key for access_src */
297-
298-
u_char *content_chunkname;
292+
u_char *content_chunkname;
293+
ngx_stream_complex_value_t content_src;
294+
u_char *content_src_key;
299295

300-
ngx_stream_complex_value_t content_src;
301-
/* content_by_lua
302-
* inline script/script
303-
* file path */
304-
305-
u_char *content_src_key; /* cached key for content_src */
306-
307-
u_char *log_chunkname;
308-
ngx_stream_complex_value_t log_src;
309-
/* log_by_lua inline script/script
310-
* file path */
311-
312-
u_char *log_src_key;
313-
/* cached key for log_src */
296+
ngx_stream_lua_handler_pt log_handler;
297+
u_char *log_chunkname;
298+
ngx_stream_complex_value_t log_src;
299+
u_char *log_src_key;
314300

315301

316302
ngx_msec_t keepalive_timeout;

src/ngx_stream_lua_module.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ ngx_stream_lua_create_main_conf(ngx_conf_t *cf)
741741
* lmcf->shm_zones = NULL;
742742
* lmcf->init_handler = NULL;
743743
* lmcf->init_src = { 0, NULL };
744+
* lmcf->init_worker_handler = NULL;
745+
* lmcf->init_worker_src = { 0, NULL };
744746
* lmcf->shm_zones_inited = 0;
745747
* lmcf->shdict_zones = NULL;
746748
* lmcf->preload_hooks = NULL;
@@ -844,13 +846,20 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf)
844846
* lscf->srv.ssl_cert_src = { 0, NULL };
845847
* lscf->srv.ssl_cert_src_key = NULL;
846848
*
847-
* lscf->srv.ssl_session_store_handler = NULL;
848-
* lscf->srv.ssl_session_store_src = { 0, NULL };
849-
* lscf->srv.ssl_session_store_src_key = NULL;
849+
* lscf->preread_handler = NULL;
850+
* lscf->preread_chunkname = NULL;
851+
* lscf->preread_src = {{ 0, NULL }, NULL, NULL, NULL};
852+
* lscf->preread_src_key = NULL;
850853
*
851-
* lscf->srv.ssl_session_fetch_handler = NULL;
852-
* lscf->srv.ssl_session_fetch_src = { 0, NULL };
853-
* lscf->srv.ssl_session_fetch_src_key = NULL;
854+
* lscf->content_handler = NULL;
855+
* lscf->content_chunkname = NULL;
856+
* lscf->content_src = {{ 0, NULL }, NULL, NULL, NULL};
857+
* lscf->content_src_key = NULL;
858+
859+
* lscf->log_handler = NULL;
860+
* lscf->log_chunkname = NULL;
861+
* lscf->log_src = {{ 0, NULL }, NULL, NULL, NULL};
862+
* lscf->log_src_key = NULL;
854863
*
855864
* lscf->balancer.handler = NULL;
856865
* lscf->balancer.src = { 0, NULL };

0 commit comments

Comments
 (0)