httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/lib apr_pools.c
Date Sun, 21 May 2000 05:13:10 GMT
manoj       00/05/20 22:13:10

  Modified:    src/lib/apr/include apr_lib.h
               src/lib/apr/lib apr_pools.c
  Log:
  Since cleanups return an APR status, ap_run_cleanup should too.
  
  Revision  Changes    Path
  1.30      +1 -1      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- apr_lib.h	2000/04/30 17:43:39	1.29
  +++ apr_lib.h	2000/05/21 05:13:09	1.30
  @@ -341,7 +341,7 @@
   				      ap_status_t (*child_cleanup) (void *));
   API_EXPORT(void) ap_kill_cleanup(struct ap_pool_t *p, void *data,
   				  ap_status_t (*cleanup) (void *));
  -API_EXPORT(void) ap_run_cleanup(struct ap_pool_t *p, void *data,
  +API_EXPORT(ap_status_t) ap_run_cleanup(struct ap_pool_t *p, void *data,
   				 ap_status_t (*cleanup) (void *));
   API_EXPORT(void) ap_cleanup_for_exec(void);
   API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
  
  
  
  1.51      +5 -2      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- apr_pools.c	2000/05/19 23:04:39	1.50
  +++ apr_pools.c	2000/05/21 05:13:10	1.51
  @@ -612,13 +612,16 @@
       }
   }
   
  -API_EXPORT(void) ap_run_cleanup(ap_pool_t *p, void *data,
  +API_EXPORT(ap_status_t) ap_run_cleanup(ap_pool_t *p, void *data,
   				 ap_status_t (*cleanup) (void *))
   {
  +    ap_status_t rv;
  +
       ap_block_alarms();		/* Run cleanup only once! */
  -    (*cleanup) (data);
  +    rv = (*cleanup) (data);
       ap_kill_cleanup(p, data, cleanup);
       ap_unblock_alarms();
  +    return rv;
   }
   
   static void run_cleanups(struct cleanup *c)
  
  
  

Mime
View raw message