Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 114:ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jul 2003 06:11:50 +0000 |
parents | 7ebc8b7fb816 |
children | f6e3c5d019b6 |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Fri Jul 04 15:10:33 2003 +0000 +++ b/src/core/ngx_conf_file.c Mon Jul 07 06:11:50 2003 +0000 @@ -25,6 +25,11 @@ ngx_conf_file_t *prev; ngx_command_t *cmd; +#if (NGX_SUPPRESS_WARN) + fd = NGX_INVALID_FILE; + prev = NULL; +#endif + if (filename) { /* open configuration file */ @@ -53,6 +58,7 @@ cf->conf_file->file.fd = fd; cf->conf_file->file.name.len = filename->len; cf->conf_file->file.name.data = filename->data; + cf->conf_file->file.offset = 0; cf->conf_file->file.log = cf->log;; cf->conf_file->line = 1; } @@ -68,11 +74,11 @@ #endif if (rc == NGX_ERROR) { - return NGX_CONF_ERROR; + break; } if (rc != NGX_OK) { - return NGX_CONF_OK; + break; } if (cf->handler) { @@ -84,7 +90,8 @@ continue; } else if (rv == NGX_CONF_ERROR) { - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } else { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, @@ -92,14 +99,15 @@ rv, cf->conf_file->file.name.data, cf->conf_file->line); - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } } name = (ngx_str_t *) cf->args->elts; found = 0; - for (m = 0; !found && ngx_modules[m]; m++) { + for (m = 0; rc != NGX_ERROR && !found && ngx_modules[m]; m++) { /* look up the directive in the appropriate modules */ @@ -131,7 +139,8 @@ name->data, cf->conf_file->file.name.data, cf->conf_file->line); - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } /* is the directive's argument count right ? */ @@ -169,7 +178,8 @@ name->data, cf->conf_file->file.name.data, cf->conf_file->line); - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } /* set up the directive's configuration context */ @@ -198,7 +208,8 @@ break; } else if (rv == NGX_CONF_ERROR) { - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } else { if (rv == ngx_conf_errstr) { @@ -215,7 +226,8 @@ cf->conf_file->line); } - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } } @@ -230,7 +242,8 @@ cf->conf_file->file.name.data, cf->conf_file->line); - return NGX_CONF_ERROR; + rc = NGX_ERROR; + break; } } @@ -245,6 +258,10 @@ } } + if (rc == NGX_ERROR) { + return NGX_CONF_ERROR; + } + return NGX_CONF_OK; }