apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/shmem/unix shm.c
Date Tue, 16 Apr 2002 20:25:57 GMT
trawick     02/04/16 13:25:57

  Modified:    i18n/unix xlate.c
               mmap/unix mmap.c
               network_io/unix sockets.c
               shmem/unix shm.c
  Log:
  standardize some apr_foo_close() functions (call apr_pool_cleanup_run())
  
  a couple of these functions didn't kill the cleanup if it failed; we might
  as well; the error isn't going to magically disappear next time we try
  
  Revision  Changes    Path
  1.25      +1 -7      apr/i18n/unix/xlate.c
  
  Index: xlate.c
  ===================================================================
  RCS file: /home/cvs/apr/i18n/unix/xlate.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- xlate.c	13 Mar 2002 20:39:13 -0000	1.24
  +++ xlate.c	16 Apr 2002 20:25:57 -0000	1.25
  @@ -357,13 +357,7 @@
   
   apr_status_t apr_xlate_close(apr_xlate_t *convset)
   {
  -    apr_status_t status;
  -
  -    if ((status = apr_xlate_cleanup(convset)) == APR_SUCCESS) {
  -        apr_pool_cleanup_kill(convset->pool, convset, apr_xlate_cleanup);
  -    }
  -
  -    return status;
  +    return apr_pool_cleanup_run(convset->pool, convset, apr_xlate_cleanup);
   }
   
   #endif /* APR_HAS_XLATE */
  
  
  
  1.43      +1 -7      apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- mmap.c	10 Apr 2002 04:54:21 -0000	1.42
  +++ mmap.c	16 Apr 2002 20:25:57 -0000	1.43
  @@ -199,13 +199,7 @@
   
   APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm)
   {
  -    apr_status_t rv;
  -
  -    if ((rv = mmap_cleanup(mm)) == APR_SUCCESS) {
  -        apr_pool_cleanup_kill(mm->cntxt, mm, mmap_cleanup);
  -        return APR_SUCCESS;
  -    }
  -    return rv;
  +    return apr_pool_cleanup_run(mm->cntxt, mm, mmap_cleanup);
   }
   
   #endif
  
  
  
  1.98      +1 -2      apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- sockets.c	15 Apr 2002 06:09:10 -0000	1.97
  +++ sockets.c	16 Apr 2002 20:25:57 -0000	1.98
  @@ -149,8 +149,7 @@
   
   apr_status_t apr_socket_close(apr_socket_t *thesocket)
   {
  -    apr_pool_cleanup_kill(thesocket->cntxt, thesocket, socket_cleanup);
  -    return socket_cleanup(thesocket);
  +    return apr_pool_cleanup_run(thesocket->cntxt, thesocket, socket_cleanup);
   }
   
   apr_status_t apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
  
  
  
  1.18      +1 -3      apr/shmem/unix/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/unix/shm.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- shm.c	13 Mar 2002 20:39:26 -0000	1.17
  +++ shm.c	16 Apr 2002 20:25:57 -0000	1.18
  @@ -418,9 +418,7 @@
   
   APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
   {
  -    apr_status_t rv = shm_cleanup_owner(m);
  -    apr_pool_cleanup_kill(m->pool, m, shm_cleanup_owner);
  -    return rv;
  +    return apr_pool_cleanup_run(m->pool, m, shm_cleanup_owner);
   }
   
   static apr_status_t shm_cleanup_attach(void *m_)
  
  
  

Mime
View raw message