From: Dmitry Volyntsev Date: Thu, 14 Oct 2021 15:18:47 +0000 (+0000) Subject: Style. X-Git-Tag: 0.7.0~2 X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=7e925fa3122342dbcc8d27fb122a321b47938838;p=njs.git Style. --- diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index dee77216..5e46218d 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -233,7 +233,7 @@ static char *ngx_http_js_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); #if (NGX_HTTP_SSL) -static char * ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *plcf); +static char * ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *jlcf); #endif static ngx_ssl_t *ngx_http_js_ssl(njs_vm_t *vm, ngx_http_request_t *r); @@ -4087,7 +4087,7 @@ ngx_http_js_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) #if (NGX_HTTP_SSL) static char * -ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *plcf) +ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *jlcf) { ngx_ssl_t *ssl; ngx_pool_cleanup_t *cln; @@ -4097,10 +4097,10 @@ ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *plcf) return NGX_CONF_ERROR; } - plcf->ssl = ssl; + jlcf->ssl = ssl; ssl->log = cf->log; - if (ngx_ssl_create(ssl, plcf->ssl_protocols, NULL) != NGX_OK) { + if (ngx_ssl_create(ssl, jlcf->ssl_protocols, NULL) != NGX_OK) { return NGX_CONF_ERROR; } @@ -4113,12 +4113,12 @@ ngx_http_js_set_ssl(ngx_conf_t *cf, ngx_http_js_loc_conf_t *plcf) cln->handler = ngx_ssl_cleanup_ctx; cln->data = ssl; - if (ngx_ssl_ciphers(NULL, ssl, &plcf->ssl_ciphers, 0) != NGX_OK) { + if (ngx_ssl_ciphers(NULL, ssl, &jlcf->ssl_ciphers, 0) != NGX_OK) { return NGX_CONF_ERROR; } - if (ngx_ssl_trusted_certificate(cf, ssl, &plcf->ssl_trusted_certificate, - plcf->ssl_verify_depth) + if (ngx_ssl_trusted_certificate(cf, ssl, &jlcf->ssl_trusted_certificate, + jlcf->ssl_verify_depth) != NGX_OK) { return NGX_CONF_ERROR; @@ -4134,11 +4134,11 @@ static ngx_ssl_t * ngx_http_js_ssl(njs_vm_t *vm, ngx_http_request_t *r) { #if (NGX_HTTP_SSL) - ngx_http_js_loc_conf_t *plcf; + ngx_http_js_loc_conf_t *jlcf; - plcf = ngx_http_get_module_loc_conf(r, ngx_http_js_module); + jlcf = ngx_http_get_module_loc_conf(r, ngx_http_js_module); - return plcf->ssl; + return jlcf->ssl; #else return NULL; #endif diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index 2f54a9b2..972e5822 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -147,7 +147,7 @@ static ngx_int_t ngx_stream_js_init(ngx_conf_t *cf); #if (NGX_SSL) static char * ngx_stream_js_set_ssl(ngx_conf_t *cf, - ngx_stream_js_srv_conf_t *pscf); + ngx_stream_js_srv_conf_t *jscf); #endif static ngx_ssl_t *ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s); @@ -2060,7 +2060,7 @@ ngx_stream_js_init(ngx_conf_t *cf) #if (NGX_SSL) static char * -ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *pscf) +ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *jscf) { ngx_ssl_t *ssl; ngx_pool_cleanup_t *cln; @@ -2070,10 +2070,10 @@ ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *pscf) return NGX_CONF_ERROR; } - pscf->ssl = ssl; + jscf->ssl = ssl; ssl->log = cf->log; - if (ngx_ssl_create(ssl, pscf->ssl_protocols, NULL) != NGX_OK) { + if (ngx_ssl_create(ssl, jscf->ssl_protocols, NULL) != NGX_OK) { return NGX_CONF_ERROR; } @@ -2086,12 +2086,12 @@ ngx_stream_js_set_ssl(ngx_conf_t *cf, ngx_stream_js_srv_conf_t *pscf) cln->handler = ngx_ssl_cleanup_ctx; cln->data = ssl; - if (ngx_ssl_ciphers(NULL, ssl, &pscf->ssl_ciphers, 0) != NGX_OK) { + if (ngx_ssl_ciphers(NULL, ssl, &jscf->ssl_ciphers, 0) != NGX_OK) { return NGX_CONF_ERROR; } - if (ngx_ssl_trusted_certificate(cf, ssl, &pscf->ssl_trusted_certificate, - pscf->ssl_verify_depth) + if (ngx_ssl_trusted_certificate(cf, ssl, &jscf->ssl_trusted_certificate, + jscf->ssl_verify_depth) != NGX_OK) { return NGX_CONF_ERROR; @@ -2107,11 +2107,11 @@ static ngx_ssl_t * ngx_stream_js_ssl(njs_vm_t *vm, ngx_stream_session_t *s) { #if (NGX_SSL) - ngx_stream_js_srv_conf_t *pscf; + ngx_stream_js_srv_conf_t *jscf; - pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_js_module); + jscf = ngx_stream_get_module_srv_conf(s, ngx_stream_js_module); - return pscf->ssl; + return jscf->ssl; #else return NULL; #endif