fix style broken by 3a8a53c0c42f

Ruslan Ermilov ru at nginx.com
Tue Apr 24 09:02:14 UTC 2018


Hi,

On Tue, Apr 24, 2018 at 04:33:15PM +0800, Peng Fang wrote:
> # HG changeset patch
> # User peng fang <fangpeng1986 at gmail.com>
> # Date 1524558323 -28800
> # Node ID 5b84c8dc4cf5e909673adc24e044a7644da7f8d5
> # Parent  7c614ef3c6ea330c62630d5065f961a27d0f82cd
> Style.
> 
> Fix style broken by 3a8a53c0c42f.
> 
> diff -r 7c614ef3c6ea -r 5b84c8dc4cf5 src/http/ngx_http_cache.h
> --- a/src/http/ngx_http_cache.h Wed Apr 18 16:11:41 2018 +0300
> +++ b/src/http/ngx_http_cache.h Tue Apr 24 16:25:23 2018 +0800
> @@ -191,7 +191,7 @@
>  ngx_int_t ngx_http_file_cache_set_header(ngx_http_request_t *r, u_char
> *buf);
>  void ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t
> *tf);
>  void ngx_http_file_cache_update_header(ngx_http_request_t *r);
> -ngx_int_t ngx_http_cache_send(ngx_http_request_t *);
> +ngx_int_t ngx_http_cache_send(ngx_http_request_t *r);
>  void ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf);
>  time_t ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t
> status);

Thanks for your patch.  It is incomplete:

diff --git a/src/http/modules/ngx_http_ssi_filter_module.h b/src/http/modules/ngx_http_ssi_filter_module.h
--- a/src/http/modules/ngx_http_ssi_filter_module.h
+++ b/src/http/modules/ngx_http_ssi_filter_module.h
@@ -85,7 +85,7 @@ typedef struct {
 
 
 typedef ngx_int_t (*ngx_http_ssi_command_pt) (ngx_http_request_t *r,
-    ngx_http_ssi_ctx_t *ctx, ngx_str_t **);
+    ngx_http_ssi_ctx_t *ctx, ngx_str_t **params);
 
 
 typedef struct {
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -159,7 +159,7 @@ ngx_int_t ngx_http_set_default_types(ngx
     ngx_str_t *default_type);
 
 #if (NGX_HTTP_DEGRADATION)
-ngx_uint_t  ngx_http_degraded(ngx_http_request_t *);
+ngx_uint_t  ngx_http_degraded(ngx_http_request_t *r);
 #endif


The patch above shows another style issue within nginx:

$ grep -r 'typedef.*pt)(' src | wc -l
54
$ grep -r 'typedef.*pt) (' src | wc -l
26

Note that nginx code now has a lot of violations of its own
code style.

Please DO NOT send us style fixing patches, we won't commit
them just for the sake of fixing style.  Only do so if you
notice the style violation while working on the code, then
you MAY send the style fixing patch as a preparatory one in
the patch series.


More information about the nginx-devel mailing list