httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1003816 - /httpd/httpd/trunk/server/config.c
Date Sat, 02 Oct 2010 15:32:52 GMT
Author: sf
Date: Sat Oct  2 15:32:51 2010
New Revision: 1003816

URL: http://svn.apache.org/viewvc?rev=1003816&view=rev
Log:
merge if blocks

Modified:
    httpd/httpd/trunk/server/config.c

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1003816&r1=1003815&r2=1003816&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Sat Oct  2 15:32:51 2010
@@ -1286,7 +1286,7 @@ AP_DECLARE(const char *) ap_build_config
     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
         if(last_ptr && *last_ptr) {
             current = *last_ptr;
         }
-    }
 
-    if (current != NULL) {
         while (current->next) {
             current = current->next;
         }



Mime
View raw message