Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 988:666302d1234c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix
author Igor Sysoev <igor@sysoev.ru>
date Sun, 07 Jan 2007 22:44:56 +0000
parents 532d15ddbe68
children c4f666fc3a7e
comparison
equal deleted inserted replaced
987:14e68f471d02 988:666302d1234c
148 block = 0; 148 block = 0;
149 } 149 }
150 150
151 if (rc == NGX_CONF_FILE_DONE && block) { 151 if (rc == NGX_CONF_FILE_DONE && block) {
152 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 152 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
153 "unexpected end of file in %s:%ui, expecting \"}\"", 153 "unexpected end of file in %s:%ui, expecting \"}\"",
154 cf->conf_file->file.name.data, 154 cf->conf_file->file.name.data,
155 cf->conf_file->line); 155 cf->conf_file->line);
156 rc = NGX_ERROR; 156 rc = NGX_ERROR;
157 break; 157 break;
158 } 158 }
159 159
160 if (rc != NGX_OK && rc != NGX_CONF_BLOCK_START) { 160 if (rc != NGX_OK && rc != NGX_CONF_BLOCK_START) {
177 rc = NGX_ERROR; 177 rc = NGX_ERROR;
178 break; 178 break;
179 } 179 }
180 180
181 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 181 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
182 "%s in %s:%ui", 182 "%s in %s:%ui",
183 rv, cf->conf_file->file.name.data, 183 rv, cf->conf_file->file.name.data,
184 cf->conf_file->line); 184 cf->conf_file->line);
185 rc = NGX_ERROR; 185 rc = NGX_ERROR;
186 break; 186 break;
187 } 187 }
188 188
189 189