Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 4777:6e37004865fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d620f497c50f
children 2b129bb067b5 db9ce6fc9482
comparison
equal deleted inserted replaced
4776:3032f4854b81 4777:6e37004865fb
1283 != 0) 1283 != 0)
1284 { 1284 {
1285 continue; 1285 continue;
1286 } 1286 }
1287 1287
1288 if (tag != shm_zone[i].tag) {
1289 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1290 "the shared memory zone \"%V\" is "
1291 "already declared for a different use",
1292 &shm_zone[i].shm.name);
1293 return NULL;
1294 }
1295
1288 if (size && size != shm_zone[i].shm.size) { 1296 if (size && size != shm_zone[i].shm.size) {
1289 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1297 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1290 "the size %uz of shared memory zone \"%V\" " 1298 "the size %uz of shared memory zone \"%V\" "
1291 "conflicts with already declared size %uz", 1299 "conflicts with already declared size %uz",
1292 size, &shm_zone[i].shm.name, shm_zone[i].shm.size); 1300 size, &shm_zone[i].shm.name, shm_zone[i].shm.size);
1293 return NULL;
1294 }
1295
1296 if (tag != shm_zone[i].tag) {
1297 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1298 "the shared memory zone \"%V\" is "
1299 "already declared for a different use",
1300 &shm_zone[i].shm.name);
1301 return NULL; 1301 return NULL;
1302 } 1302 }
1303 1303
1304 return &shm_zone[i]; 1304 return &shm_zone[i];
1305 } 1305 }