From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 15 Jan 2015 20:45:57 +0000 (+0000)
Subject: As noted by Yann, this resulted in a dead var assignment.  Preinit won't
X-Git-Tag: 2.4.12~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=473e35c29dbe27148d274071b5eafe43aedc8df6;p=thirdparty%2Fapache%2Fhttpd.git

As noted by Yann, this resulted in a dead var assignment.  Preinit won't
work due to the fact that we overload rv as both the DWORD windows result
and the apr_status_t result code.

Backport: r1611244
Reviewed by: wrowe, gsmith



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1652267 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index a46640ee588..457ff8cf99e 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -535,7 +535,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPSTR *argv)
          rv = StartServiceCtrlDispatcherA(dispatchTable);
 #endif
     if (rv) {
-        apr_status_t rv = APR_SUCCESS;
+        rv = APR_SUCCESS;
     }
     else {
         /* This is a genuine failure of the SCM. */