From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 26 Feb 2015 13:16:19 +0000 (+0000)
Subject: mpm_event: follow up to r1493741.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b50114034c8ab4432516f8a3a7f4e9bf128f5e1;p=thirdparty%2Fapache%2Fhttpd.git

mpm_event: follow up to r1493741.
Fix typo (and style) for event_unregister_socket_callback()'s final result.


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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index b448ed2aff1..154ebbc76a7 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1527,7 +1527,9 @@ static apr_status_t event_register_socket_callback_ex(apr_socket_t **s,
     }
     for (i = 0; i<nsock; i++) { 
         rc = apr_pollset_add(event_pollset, pfds[i]);
-        if (rc != APR_SUCCESS) final_rc = rc;
+        if (rc != APR_SUCCESS) {
+			final_rc = rc;
+		}
     }
     return final_rc;
 }
@@ -1564,7 +1566,9 @@ static apr_status_t event_unregister_socket_callback(apr_socket_t **s, apr_pool_
         pfds[i]->desc.s = s[i];
         pfds[i]->client_data = NULL;
         rc = apr_pollset_remove(event_pollset, pfds[i]);
-        if (rc != APR_SUCCESS && !APR_STATUS_IS_NOTFOUND(rc)) final_rc = APR_SUCCESS;
+        if (rc != APR_SUCCESS && !APR_STATUS_IS_NOTFOUND(rc)) {
+			final_rc = rc;
+		}
     }
 
     return final_rc;