Fix 'control reaches end of non-void function' warning

Submitted by:	Ben Collins-Sussman <sussman@collab.net>
Tweaked by:	    Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index 413d017606b2f59dff164ac2cff873c29a5cbf28..50a9acbf57d8cdd0f4015e4ba7ad163602be9497 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.36
 
+  *) Fix 'control reaches end of non-void function' warning in
+     server/log.c.  [Ben Collins-Sussman <sussman@collab.net>]
+
   *) Perchild MPM is now correctly deemed as experimental and is now
      located in server/mpm/experimental.  [Justin Erenkrantz]
 

diff --git a/server/log.c b/server/log.c
index 4898aba926fbfbde4b8d11afdd64756ac86cac71..d6adc339171c4168a5d8a30723a932750de3261d 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -216,8 +216,8 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p,
     if (rc != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rc, NULL,
                      "unable to replace stderr with error_log");
-        return rc;
     }
+    return rc;
 }
 
 static int log_child(apr_pool_t *p, const char *progname,