Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 975:e2d358129eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfaults
author Igor Sysoev <igor@sysoev.ru>
date Wed, 03 Jan 2007 15:43:01 +0000
parents 6e7a20529f53
children cb876bced0c2
comparison
equal deleted inserted replaced
974:8dfb3aa75de2 975:e2d358129eb6
1029 } 1029 }
1030 1030
1031 if (size && size != shm_zone[i].shm.size) { 1031 if (size && size != shm_zone[i].shm.size) {
1032 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1032 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1033 "the size %uz of shared memory zone \"%V\" " 1033 "the size %uz of shared memory zone \"%V\" "
1034 "conflicts with already declared size %uz"); 1034 "conflicts with already declared size %uz",
1035 size, &shm_zone[i].name, shm_zone[i].shm.size);
1035 return NULL; 1036 return NULL;
1036 } 1037 }
1037 1038
1038 if (tag != shm_zone[i].tag) { 1039 if (tag != shm_zone[i].tag) {
1039 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1040 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1040 "the shared memory zone \"%V\" is " 1041 "the shared memory zone \"%V\" is "
1041 "already declared for a different use"); 1042 "already declared for a different use",
1043 &shm_zone[i].name);
1042 return NULL; 1044 return NULL;
1043 } 1045 }
1044 1046
1045 return &shm_zone[i]; 1047 return &shm_zone[i];
1046 } 1048 }