OS/2: Remove the apr_pollset_t from apr_file_t. File handles can't be polled

on OS/2 so having it doesn't serve any purpose.


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

3 files changed, 0 insertions, 19 deletions

diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c
index 59530d90c..e7abb987e 100644
--- a/file_io/os2/filedup.c
+++ b/file_io/os2/filedup.c
@@ -96,10 +96,6 @@ static apr_status_t file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_po
         *new_file = dup_file;
     }
 
-    /* Create a pollset with room for one descriptor. */
-    /* ### check return codes */
-    (void) apr_pollset_create(&(*new)->pollset, 1, p, 0);
-
     return APR_SUCCESS;
 }
 
@@ -163,9 +159,5 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
     apr_pool_cleanup_kill(old_file->pool, (void *)old_file,
                           apr_file_cleanup);
 
-    /* Create a pollset with room for one descriptor. */
-    /* ### check return codes */
-    (void) apr_pollset_create(&(*new)->pollset, 1, p, 0);
-
     return APR_SUCCESS;
 }
diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index db7df5ffc..d61008ac4 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -144,10 +144,6 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr
     dafile->direction = 0;
     dafile->pipe = FALSE;
 
-    /* Create a pollset with room for one descriptor. */
-    /* ### check return codes */
-    (void) apr_pollset_create(&dafile->pollset, 1, cont, 0);
-
     if (!(flag & APR_FILE_NOCLEANUP)) { 
         apr_pool_cleanup_register(dafile->pool, dafile, apr_file_cleanup, apr_file_cleanup);
     }
@@ -244,10 +240,6 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t *thef
             return rv;
     }
 
-    /* Create a pollset with room for one descriptor. */
-    /* ### check return codes */
-    (void) apr_pollset_create(&(*new)->pollset, 1, cont, 0);
-
     return APR_SUCCESS;
 }    
 
diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c
index 083bb63d2..decf88b45 100644
--- a/file_io/os2/pipe.c
+++ b/file_io/os2/pipe.c
@@ -123,7 +123,6 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
     (*in)->pipe = 1;
     (*in)->timeout = -1;
     (*in)->blocking = BLK_ON;
-    (void) apr_pollset_create(&(*in)->pollset, 1, pool, 0);
     apr_pool_cleanup_register(pool, *in, apr_file_cleanup, apr_pool_cleanup_null);
 
     (*out) = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
@@ -136,7 +135,6 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
     (*out)->pipe = 1;
     (*out)->timeout = -1;
     (*out)->blocking = BLK_ON;
-    (void) apr_pollset_create(&(*out)->pollset, 1, pool, 0);
     apr_pool_cleanup_register(pool, *out, apr_file_cleanup, apr_pool_cleanup_null);
 
     return APR_SUCCESS;
@@ -198,7 +196,6 @@ APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
     (*file)->blocking = BLK_UNKNOWN; /* app needs to make a timeout call */
     (*file)->timeout = -1;
     (*file)->filedes = *thefile;
-    (void) apr_pollset_create(&(*file)->pollset, 1, pool, 0);
 
     if (register_cleanup) {
         apr_pool_cleanup_register(pool, *file, apr_file_cleanup,