apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: apr/file_io/unix dir.c
Date Wed, 21 Feb 2001 14:52:16 GMT
stoddard    01/02/21 06:52:16

  Modified:    file_io/unix dir.c
  Log:
  Unregister the cleanup, regardless of the success of failure of the
  call to dir_cleanup.
  
  Revision  Changes    Path
  1.54      +2 -7      apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/dir.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- dir.c	2001/02/16 04:15:37	1.53
  +++ dir.c	2001/02/21 14:52:15	1.54
  @@ -103,13 +103,8 @@
   
   apr_status_t apr_dir_close(apr_dir_t *thedir)
   {
  -    apr_status_t rv;
  -
  -    if ((rv = dir_cleanup(thedir)) == APR_SUCCESS) {
  -        apr_pool_cleanup_kill(thedir->cntxt, thedir, dir_cleanup);
  -        return APR_SUCCESS;
  -    }
  -    return rv;
  +    apr_pool_cleanup_kill(thedir->cntxt, thedir, dir_cleanup);
  +    return dir_cleanup(thedir);
   }
   
   apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
  
  
  

Mime
View raw message