apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: apr/include/arch/os2 apr_arch_file_io.h
Date Wed, 19 Nov 2003 08:53:20 GMT
bjh         2003/11/19 00:53:20

  Modified:    file_io/os2 filedup.c open.c pipe.c
               include/arch/os2 apr_arch_file_io.h
  Log:
  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.
  
  Revision  Changes    Path
  1.34      +0 -8      apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filedup.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- filedup.c	17 Nov 2003 01:41:17 -0000	1.33
  +++ filedup.c	19 Nov 2003 08:53:20 -0000	1.34
  @@ -96,10 +96,6 @@
           *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;
   }
   
  @@ -162,10 +158,6 @@
       old_file->filedes = -1;
       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;
   }
  
  
  
  1.61      +0 -8      apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/open.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- open.c	17 Nov 2003 01:41:17 -0000	1.60
  +++ open.c	19 Nov 2003 08:53:20 -0000	1.61
  @@ -144,10 +144,6 @@
       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);
       }
  @@ -243,10 +239,6 @@
           if (rv)
               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;
   }    
  
  
  
  1.43      +0 -3      apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/pipe.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- pipe.c	17 Nov 2003 01:41:17 -0000	1.42
  +++ pipe.c	19 Nov 2003 08:53:20 -0000	1.43
  @@ -123,7 +123,6 @@
       (*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 @@
       (*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 @@
       (*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,
  
  
  
  1.3       +0 -3      apr/include/arch/os2/apr_arch_file_io.h
  
  Index: apr_arch_file_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/os2/apr_arch_file_io.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_arch_file_io.h	17 Nov 2003 01:41:17 -0000	1.2
  +++ apr_arch_file_io.h	19 Nov 2003 08:53:20 -0000	1.3
  @@ -84,9 +84,6 @@
       HEV pipeSem;
       enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
   
  -    /* if there is a timeout set, then this pollset is used */
  -    apr_pollset_t *pollset;
  -
       /* Stuff for buffered mode */
       char *buffer;
       int bufpos;               // Read/Write position in buffer
  
  
  

Mime
View raw message