summaryrefslogtreecommitdiff
path: root/file_io/os2
diff options
context:
space:
mode:
authorBrian Havard <bjh@apache.org>2010-04-06 18:50:08 +0000
committerBrian Havard <bjh@apache.org>2010-04-06 18:50:08 +0000
commit8f8d80eb7fe4635f1c18bb7ea76412d9c61d0904 (patch)
treee4a1593d1ae6fb593264def8734889a5e96e90ed /file_io/os2
parent3ae12525008fa0e62edf4c20ffc1c11dceabd8e2 (diff)
downloadapr-8f8d80eb7fe4635f1c18bb7ea76412d9c61d0904.tar.gz
OS/2: Fix return value from apr_file_pipe_timeout_set() when the pipe doesn't
need its blocking status changed. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@931269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/os2')
-rw-r--r--file_io/os2/pipe.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index d0851932e..c6aae5c7e 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -145,6 +145,8 @@ APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, apr_fi
APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
{
+ apr_status_t rv = APR_SUCCESS;
+
if (thepipe->pipe == 1) {
thepipe->timeout = timeout;
@@ -161,7 +163,11 @@ APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_int
}
}
}
- return APR_EINVAL;
+ else {
+ rv = APR_EINVAL;
+ }
+
+ return rv;
}