Mercurial > hg > nginx
changeset 4777:6e37004865fb
Reorder checks in ngx_shared_memory_add() for more consistent error messages.
author | Andrey Belov <defan@nginx.com> |
---|---|
date | Wed, 01 Aug 2012 14:37:08 +0000 |
parents | 3032f4854b81 |
children | a48031f7a69c |
files | src/core/ngx_cycle.c |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -1285,6 +1285,14 @@ ngx_shared_memory_add(ngx_conf_t *cf, ng continue; } + if (tag != shm_zone[i].tag) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "the shared memory zone \"%V\" is " + "already declared for a different use", + &shm_zone[i].shm.name); + return NULL; + } + if (size && size != shm_zone[i].shm.size) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "the size %uz of shared memory zone \"%V\" " @@ -1293,14 +1301,6 @@ ngx_shared_memory_add(ngx_conf_t *cf, ng return NULL; } - if (tag != shm_zone[i].tag) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "the shared memory zone \"%V\" is " - "already declared for a different use", - &shm_zone[i].shm.name); - return NULL; - } - return &shm_zone[i]; }