Stream: style.

diff --git a/src/stream/ngx_stream_limit_conn_module.c b/src/stream/ngx_stream_limit_conn_module.c
index 9ad52eff1ef3b2e4fedd3975cf536f549b1d5660..40eca94f20188d2c184c86c01a025d0945265706 100644 (file)
--- a/src/stream/ngx_stream_limit_conn_module.c
+++ b/src/stream/ngx_stream_limit_conn_module.c
@@ -101,7 +101,7 @@ static ngx_stream_module_t  ngx_stream_limit_conn_module_ctx = {
     NULL,                                  /* init main configuration */
 
     ngx_stream_limit_conn_create_conf,     /* create server configuration */
-    ngx_stream_limit_conn_merge_conf,      /* merge server configuration */
+    ngx_stream_limit_conn_merge_conf       /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_map_module.c b/src/stream/ngx_stream_map_module.c
index 9e4c2ca35ce80fb4783cd92a7a566e8621895976..47a15bef7a64c8970bc70fe19af6d720a13db209 100644 (file)
--- a/src/stream/ngx_stream_map_module.c
+++ b/src/stream/ngx_stream_map_module.c
@@ -81,7 +81,7 @@ static ngx_stream_module_t  ngx_stream_map_module_ctx = {
     NULL,                                  /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_return_module.c b/src/stream/ngx_stream_return_module.c
index c1a16ef1a6baab6c9a846dbcb61eeddd6396ad11..3ab9bdf588819306b97ce205cd0debd859fd6469 100644 (file)
--- a/src/stream/ngx_stream_return_module.c
+++ b/src/stream/ngx_stream_return_module.c
@@ -48,7 +48,7 @@ static ngx_stream_module_t  ngx_stream_return_module_ctx = {
     NULL,                                  /* init main configuration */
 
     ngx_stream_return_create_srv_conf,     /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_upstream.c b/src/stream/ngx_stream_upstream.c
index 36d05cc886127540cc1f2ccc03c3f088c27495b0..2ea5eebd359fd867d49cb7d53377bfa08abdfd11 100644 (file)
--- a/src/stream/ngx_stream_upstream.c
+++ b/src/stream/ngx_stream_upstream.c
@@ -46,7 +46,7 @@ static ngx_stream_module_t  ngx_stream_upstream_module_ctx = {
     ngx_stream_upstream_init_main_conf,    /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_upstream_hash_module.c b/src/stream/ngx_stream_upstream_hash_module.c
index 41433dcd4d88a8d23b5398e221b72695ed4b3759..88185eb0575281a96873e1cb496e79d7c8ba9c0c 100644 (file)
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -84,7 +84,7 @@ static ngx_stream_module_t  ngx_stream_upstream_hash_module_ctx = {
     NULL,                                  /* init main configuration */
 
     ngx_stream_upstream_hash_create_conf,  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_upstream_least_conn_module.c b/src/stream/ngx_stream_upstream_least_conn_module.c
index 359d78808cd68ec4b921cfb464f6c8c7d170eb53..e884975fa376312cf9d8cef95314a9ebe75a16b3 100644 (file)
--- a/src/stream/ngx_stream_upstream_least_conn_module.c
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c
@@ -39,7 +39,7 @@ static ngx_stream_module_t  ngx_stream_upstream_least_conn_module_ctx = {
     NULL,                                    /* init main configuration */
 
     NULL,                                    /* create server configuration */
-    NULL,                                    /* merge server configuration */
+    NULL                                     /* merge server configuration */
 };
 
 

diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index ddcc093c0247375f36953de2c11dfc4bc721bd2f..07ab88dfa8905ae9e0900a9ba8dd4bdeeba559d4 100644 (file)
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -39,7 +39,7 @@ static ngx_stream_module_t  ngx_stream_upstream_zone_module_ctx = {
     NULL,                                  /* init main configuration */
 
     NULL,                                  /* create server configuration */
-    NULL,                                  /* merge server configuration */
+    NULL                                   /* merge server configuration */
 };