From cvs-return-1132-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sun Apr 29 21:37:18 2001
Return-Path: <cvs-return-1132-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 8920 invoked by uid 500); 29 Apr 2001 21:37:17 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 8909 invoked by uid 1103); 29 Apr 2001 21:37:17 -0000
Date: 29 Apr 2001 21:37:17 -0000
Message-ID: <20010429213717.8908.qmail@apache.org>
From: dreid@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/dso/unix dso.c

dreid       01/04/29 14:37:17

  Modified:    include/arch/unix dso.h
               dso/unix dso.c
  Log:
  We have pools not contexts...
  
  Revision  Changes    Path
  1.14      +2 -2      apr/include/arch/unix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/dso.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- dso.h	2001/04/18 17:47:11	1.13
  +++ dso.h	2001/04/29 21:37:16	1.14
  @@ -90,9 +90,9 @@
   #endif
   
   struct apr_dso_handle_t {
  -    apr_pool_t  *cont;
  +    apr_pool_t    *pool;
       void          *handle;
  -    const char *errormsg;
  +    const char    *errormsg;
   };
   
   #endif
  
  
  
  1.40      +8 -7      apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/unix/dso.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- dso.c	2001/04/27 00:16:03	1.39
  +++ dso.c	2001/04/29 21:37:17	1.40
  @@ -75,7 +75,7 @@
   {
       *aprdso = apr_pcalloc(pool, sizeof **aprdso);
       (*aprdso)->handle = osdso;
  -    (*aprdso)->cont = pool;
  +    (*aprdso)->pool = pool;
       return APR_SUCCESS;
   }
   
  @@ -107,7 +107,7 @@
   }
   
   APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
  -                                       const char *path, apr_pool_t *ctx)
  +                                       const char *path, apr_pool_t *pool)
   {
   #if defined(DSO_USE_SHL)
       shl_t os_handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
  @@ -139,7 +139,7 @@
   #endif    
   #endif /* DSO_USE_x */
   
  -    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
  +    *res_handle = apr_pcalloc(pool, sizeof(**res_handle));
   
       if(os_handle == NULL) {
   #if defined(DSO_USE_SHL)
  @@ -155,17 +155,17 @@
       }
   
       (*res_handle)->handle = (void*)os_handle;
  -    (*res_handle)->cont = ctx;
  +    (*res_handle)->pool = pool;
       (*res_handle)->errormsg = NULL;
   
  -    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, 
  @@ -231,7 +231,8 @@
   #endif /* DSO_USE_x */
   }
   
  -APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
  +APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, 
  +                                        apr_size_t buflen)
   {
       if (dso->errormsg) {
           apr_cpystrn(buffer, dso->errormsg, buflen);