From: Stefan Fritsch <sf@apache.org>
Date: Sat, 2 Oct 2010 15:32:51 +0000 (+0000)
Subject: merge if blocks
X-Git-Tag: 2.3.9~371
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5507079237415ebec7a98dbc757ce04d7157ada9;p=thirdparty%2Fapache%2Fhttpd.git

merge if blocks


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1003816 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/config.c b/server/config.c
index 538a7268ec0..1b2772fef4d 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1286,7 +1286,7 @@ AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
     const char *errmsg;
     ap_directive_t **last_ptr = NULL;
 
-    if(current) {
+    if (current != NULL) {
         /* If we have to traverse the whole tree again for every included
          * config file, the required time grows as O(n^2) with the number of
          * files. This can be a significant delay for large configurations.
@@ -1297,9 +1297,7 @@ AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
         if(last_ptr && *last_ptr) {
             current = *last_ptr;
         }
-    }
 
-    if (current != NULL) {
         while (current->next) {
             current = current->next;
         }