pipe: factorize apr_file_pipe_create*() in terms of static helper

file_pipe_create(), to avoid duplicated code.



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

1 files changed, 5 insertions, 23 deletions

diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index 914b77782..4dbe30dbf 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -123,12 +123,6 @@ static apr_status_t file_pipe_create(apr_file_t **in, apr_file_t **out,
     apr_pool_cleanup_register(pool_out, *out, apr_file_cleanup,
             apr_pool_cleanup_null);
 
-    return APR_SUCCESS;
-}
-
-static void file_pipe_block(apr_file_t **in, apr_file_t **out,
-        apr_int32_t blocking)
-{
     switch (blocking) {
     case APR_FULL_BLOCK:
         break;
@@ -143,13 +137,15 @@ static void file_pipe_block(apr_file_t **in, apr_file_t **out,
         apr_file_pipe_timeout_set(*in, 0);
         break;
     }
+    return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
                                                apr_file_t **out,
                                                apr_pool_t *pool)
 {
-    return file_pipe_create(in, out, pool, pool);
+    /* Default is full blocking pipes. */
+    return file_pipe_create(in, out, APR_FULL_BLOCK, pool, pool);
 }
 
 APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
@@ -157,14 +153,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in,
                                                   apr_int32_t blocking,
                                                   apr_pool_t *pool)
 {
-    apr_status_t status;
-
-    if ((status = file_pipe_create(in, out, pool, pool)) != APR_SUCCESS)
-        return status;
-
-    file_pipe_block(in, out, blocking);
-
-    return APR_SUCCESS;
+    return file_pipe_create(in, out, blocking, pool, pool);
 }
 
 APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
@@ -173,14 +162,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in,
                                                      apr_pool_t *pool_in,
                                                      apr_pool_t *pool_out)
 {
-    apr_status_t status;
-
-    if ((status = file_pipe_create(in, out, pool_in, pool_out)) != APR_SUCCESS)
-        return status;
-
-    file_pipe_block(in, out, blocking);
-
-    return APR_SUCCESS;
+    return file_pipe_create(in, out, blocking, pool_in, pool_out);
 }