cvs commit: apr/dso/beos dso.c

[dreid]

dreid       01/04/29 15:03:44

  Modified:    include/arch/beos dso.h
               dso/beos dso.c
  Log:
  More pools instead of contexts...
  
  Revision  Changes    Path
  1.13      +2 -2      apr/include/arch/beos/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/beos/dso.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- dso.h     2001/02/16 04:15:49     1.12
  +++ dso.h     2001/04/29 22:03:43     1.13
  @@ -67,8 +67,8 @@
   #if APR_HAS_DSO
   
   struct apr_dso_handle_t {
  -    image_id       handle;    /* Handle to the DSO loaded */
  -    apr_pool_t   *cont;
  +    image_id      handle;    /* Handle to the DSO loaded */
  +    apr_pool_t   *pool;
   };
   
   #endif
  
  
  
  1.20      +8 -8      apr/dso/beos/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/beos/dso.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- dso.c     2001/04/25 09:00:47     1.19
  +++ dso.c     2001/04/29 22:03:43     1.20
  @@ -62,32 +62,32 @@
       apr_dso_handle_t *dso = thedso;
   
       if (dso->handle > 0 && unload_add_on(dso->handle) < B_NO_ERROR)
  -      return APR_EINIT;
  +        return APR_EINIT;
       dso->handle = -1;
   
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const 
char *path,
  -              apr_pool_t *ctx)
  +APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
  +                                       const char *path, apr_pool_t *pool)
   {
       image_id newid;
   
       if((newid = load_add_on(path)) < B_NO_ERROR)
           return APR_EINIT;
   
  -    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
  +    *res_handle = apr_pcalloc(pool, sizeof(*res_handle));
       (*res_handle)->handle = newid;
  -    (*res_handle)->cont = ctx;
  +    (*res_handle)->pool = pool;
   
  -    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, 
apr_pool_cleanup_null);
  +    apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, 
apr_pool_cleanup_null);
   
       return APR_SUCCESS;
   }
   
   APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
   {
  -    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
  +    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
   }
   
   APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
apr_dso_handle_t *handle,
  @@ -119,7 +119,7 @@
   {
       *aprdso = apr_pcalloc(pool, sizeof **aprdso);
       (*aprdso)->handle = osdso;
  -    (*aprdso)->cont = pool;
  +    (*aprdso)->pool = pool;
       return APR_SUCCESS;
   }