Mercurial > hg > nginx

changeset 2064:0835142149d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactor obscure code
author Igor Sysoev <igor@sysoev.ru>
date Wed, 25 Jun 2008 14:56:14 +0000
parents 67a29af877ed
children 520cb18b64fb
files src/core/ngx_conf_file.c
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -145,23 +145,27 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t
         }
 
         if (rc == NGX_CONF_BLOCK_DONE) {
+
             if (!block) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "unexpected \"}\"");
                 goto failed;
             }
 
-            block = 0;
+            goto done;
         }
 
-        if (rc == NGX_CONF_FILE_DONE && block) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "unexpected end of file, expecting \"}\"");
-            goto failed;
+        if (rc == NGX_CONF_FILE_DONE) {
+
+            if (block) {
+                ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                   "unexpected end of file, expecting \"}\"");
+                goto failed;
+            }
+
+            goto done;
         }
 
-        if (rc != NGX_OK && rc != NGX_CONF_BLOCK_START) {
-            goto done;
-        }
+        /* rc == NGX_OK || rc == NGX_CONF_BLOCK_START */
 
         if (cf->handler) {