commit cd04ca3546f64deeabcbd477c5eb627f1af71685
author Ruslan Ermilov <ru@nginx.com> Fri Dec 14 19:35:37 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Fri Dec 14 19:35:37 2012 +0000
tree 4a234fffc8eecc35b431caa19d357cb58aaf2858
parent fac3b341dae56adccc1ffa7e8147b3694b209381

Geo: improved ngx_http_geo_block() code readability.

src/http/modules/ngx_http_geo_module.c

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index bdad969..8d2679d 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -303,7 +303,6 @@
 ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     char                     *rv;
-    void                    **p;
     size_t                    len;
     ngx_str_t                *value, name;
     ngx_uint_t                i;
@@ -402,8 +401,8 @@
                     return NGX_CONF_ERROR;
                 }
 
-                p = (void **) ngx_cpymem(ctx.high.low[i], a->elts, len);
-                *p = NULL;
+                ngx_memcpy(ctx.high.low[i], a->elts, len);
+                ctx.high.low[i][a->nelts].value = NULL;
                 ctx.data_size += len + sizeof(void *);
             }