summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68>2006-10-03 15:07:44 +0000
committerrooneg <rooneg@13f79535-47bb-0310-9956-ffa450edef68>2006-10-03 15:07:44 +0000
commitb904b90c8e1bacb4cdd100adeab1fa13c9e9cfa3 (patch)
tree26c5e592eccb0b61d330675fd3a9489e809137d1
parentf05b0e6f0ff212d635bf59de3420e6511eed7e11 (diff)
downloadlibapr-b904b90c8e1bacb4cdd100adeab1fa13c9e9cfa3.tar.gz
Fix PR 40662.
Submitted by: Larry Cipriani <lvc lucent.com> * poll/unix/kqueue.c (apr_pollset_create): Fix error checking. * CHANGES: Note change. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@452527 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--poll/unix/kqueue.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 73755fe1e..0aaa421e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
Changes for APR 1.3.0
+ *) Fix error checking in kqueue version of apr_pollset_create.
+ PR 40662 [Larry Cipriani lvc lucent.com]
+
*) Add some documentation on the format matched by apr_fnmatch.
[David Glasser <glasser mit.edu>]
diff --git a/poll/unix/kqueue.c b/poll/unix/kqueue.c
index fdabd487c..7fa85af62 100644
--- a/poll/unix/kqueue.c
+++ b/poll/unix/kqueue.c
@@ -75,7 +75,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
if (flags & APR_POLLSET_THREADSAFE &&
((rv = apr_thread_mutex_create(&(*pollset)->ring_lock,
APR_THREAD_MUTEX_DEFAULT,
- p) != APR_SUCCESS))) {
+ p)) != APR_SUCCESS)) {
*pollset = NULL;
return rv;
}