You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/02/26 14:16:19 UTC
svn commit: r1662440 - /httpd/httpd/trunk/server/mpm/event/event.c
Author: ylavic
Date: Thu Feb 26 13:16:19 2015
New Revision: 1662440
URL: http://svn.apache.org/r1662440
Log:
mpm_event: follow up to r1493741.
Fix typo (and style) for event_unregister_socket_callback()'s final result.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1662440&r1=1662439&r2=1662440&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Thu Feb 26 13:16:19 2015
@@ -1527,7 +1527,9 @@ static apr_status_t event_register_socke
}
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_soc
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;