[nginx] Map: simplified "map" block parser.

Ruslan Ermilov ru at nginx.com
Thu Dec 8 18:46:46 UTC 2016


details:   http://hg.nginx.org/nginx/rev/014905eb7b3d
branches:  
changeset: 6831:014905eb7b3d
user:      Ruslan Ermilov <ru at nginx.com>
date:      Thu Dec 08 17:29:01 2016 +0300
description:
Map: simplified "map" block parser.

No functional changes.

diffstat:

 src/http/modules/ngx_http_map_module.c |  3 ++-
 src/stream/ngx_stream_map_module.c     |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 6eed5ed31e22 -r 014905eb7b3d src/http/modules/ngx_http_map_module.c
--- a/src/http/modules/ngx_http_map_module.c	Thu Dec 08 17:22:07 2016 +0300
+++ b/src/http/modules/ngx_http_map_module.c	Thu Dec 08 17:29:01 2016 +0300
@@ -393,8 +393,9 @@ ngx_http_map(ngx_conf_t *cf, ngx_command
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;
diff -r 6eed5ed31e22 -r 014905eb7b3d src/stream/ngx_stream_map_module.c
--- a/src/stream/ngx_stream_map_module.c	Thu Dec 08 17:22:07 2016 +0300
+++ b/src/stream/ngx_stream_map_module.c	Thu Dec 08 17:29:01 2016 +0300
@@ -392,8 +392,9 @@ ngx_stream_map(ngx_conf_t *cf, ngx_comma
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;


More information about the nginx-devel mailing list