commit eb03ea74588aa57fb224e85de50ff41ea63cf420
author Igor Sysoev <igor@sysoev.ru> Wed Jun 25 14:56:14 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Jun 25 14:56:14 2008 +0000
tree e38fab060c5d7242e2b56b8469d08bce0f51239b
parent 3e6f74da0556265b7ad3fbdb629f2898b1e1936f

refactor obscure code

src/core/ngx_conf_file.c

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index b32f0f0..dbeb39d 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -145,24 +145,28 @@
         }
 
         if (rc == NGX_CONF_BLOCK_DONE) {
+
             if (!block) {
                 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "unexpected \"}\"");
                 goto failed;
             }
 
-            block = 0;
-        }
-
-        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_OK && rc != NGX_CONF_BLOCK_START) {
             goto done;
         }
 
+        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;
+        }
+
+        /* rc == NGX_OK || rc == NGX_CONF_BLOCK_START */
+
         if (cf->handler) {
 
             /*