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 538a7268ec0463afa389105a601023de4094635b..1b2772fef4dc0dc59f1a5ea0b244e2a1adcd4745 100644 (file)
--- 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;
         }