From cvs-return-728-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Mon Feb 19 02:07:00 2001 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 71701 invoked by uid 500); 19 Feb 2001 02:06:59 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 71690 invoked by uid 1066); 19 Feb 2001 02:06:59 -0000 Date: 19 Feb 2001 02:06:59 -0000 Message-ID: <20010219020659.71689.qmail@apache.org> From: dougm@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/lib apr_pools.c dougm 01/02/18 18:06:59 Modified: modules/aaa mod_auth.c mod_auth_digest.c modules/generators mod_autoindex.c modules/test mod_autoindex.c server main.c server/mpm/beos beos.c server/mpm/perchild perchild.c server/mpm/prefork prefork.c server/mpm/spmt_os2 spmt_os2.c server/mpm/threaded threaded.c server/mpm/winnt mpm_winnt.c include apr_compat.h apr_pools.h lib apr_pools.c Log: rename miss: s/apr_clear_pool/apr_pool_clear/g Revision Changes Path 1.32 +1 -1 httpd-2.0/modules/aaa/mod_auth.c Index: mod_auth.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mod_auth.c 2001/02/18 02:07:25 1.31 +++ mod_auth.c 2001/02/19 02:06:56 1.32 @@ -173,7 +173,7 @@ if ((l[0] == '#') || (!l[0])) continue; ll = l; - apr_clear_pool(sp); + apr_pool_clear(sp); group_name = ap_getword(sp, &ll, ':'); 1.40 +1 -1 httpd-2.0/modules/aaa/mod_auth_digest.c Index: mod_auth_digest.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mod_auth_digest.c 2001/02/18 02:58:50 1.39 +++ mod_auth_digest.c 2001/02/19 02:06:56 1.40 @@ -1795,7 +1795,7 @@ if ((l[0] == '#') || (!l[0])) continue; ll = l; - apr_clear_pool(sp); + apr_pool_clear(sp); group_name = ap_getword(sp, &ll, ':'); 1.59 +1 -1 httpd-2.0/modules/generators/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- mod_autoindex.c 2001/02/16 04:26:38 1.58 +++ mod_autoindex.c 2001/02/19 02:06:57 1.59 @@ -1373,7 +1373,7 @@ char *anchor, *t, *t2; int nwidth; - apr_clear_pool(scratch); + apr_pool_clear(scratch); if (is_parent(ar[x]->name)) { t = ap_make_full_path(scratch, name, "../"); 1.9 +1 -1 httpd-2.0/modules/test/mod_autoindex.c Index: mod_autoindex.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/test/mod_autoindex.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_autoindex.c 2001/02/16 04:26:42 1.8 +++ mod_autoindex.c 2001/02/19 02:06:57 1.9 @@ -1372,7 +1372,7 @@ char *anchor, *t, *t2; int nwidth; - apr_clear_pool(scratch); + apr_pool_clear(scratch); if (is_parent(ar[x]->name)) { t = ap_make_full_path(scratch, name, "../"); 1.92 +3 -3 httpd-2.0/server/main.c Index: main.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/main.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- main.c 2001/02/16 04:26:47 1.91 +++ main.c 2001/02/19 02:06:57 1.92 @@ -392,14 +392,14 @@ ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n"); destroy_and_exit_process(process, 0); } - apr_clear_pool(plog); + apr_pool_clear(plog); ap_run_open_logs(pconf, plog, ptemp, server_conf); ap_post_config_hook(pconf, plog, ptemp, server_conf); apr_pool_destroy(ptemp); for (;;) { apr_hook_deregister_all(); - apr_clear_pool(pconf); + apr_pool_clear(pconf); for (mod = ap_prelinked_modules; *mod != NULL; mod++) { ap_register_hooks(*mod, pconf); } @@ -418,7 +418,7 @@ ap_fixup_virtual_hosts(pconf, server_conf); ap_fini_vhost_config(pconf, server_conf); apr_sort_hooks(); - apr_clear_pool(plog); + apr_pool_clear(plog); ap_run_open_logs(pconf, plog, ptemp, server_conf); ap_post_config_hook(pconf, plog, ptemp, server_conf); apr_pool_destroy(ptemp); 1.45 +1 -1 httpd-2.0/server/mpm/beos/beos.c Index: beos.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- beos.c 2001/02/16 04:26:49 1.44 +++ beos.c 2001/02/19 02:06:57 1.45 @@ -428,7 +428,7 @@ apr_lock_release(accept_mutex); break; } - apr_clear_pool(ptrans); + apr_pool_clear(ptrans); } ap_update_child_status(0, child_slot, SERVER_DEAD, (request_rec*)NULL); 1.49 +1 -1 httpd-2.0/server/mpm/perchild/perchild.c Index: perchild.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- perchild.c 2001/02/16 04:26:51 1.48 +++ perchild.c 2001/02/19 02:06:58 1.49 @@ -734,7 +734,7 @@ pthread_mutex_unlock(&idle_thread_count_mutex); break; } - apr_clear_pool(ptrans); + apr_pool_clear(ptrans); } pthread_mutex_lock(&thread_pool_parent_mutex); 1.167 +1 -1 httpd-2.0/server/mpm/prefork/prefork.c Index: prefork.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- prefork.c 2001/02/16 04:26:51 1.166 +++ prefork.c 2001/02/19 02:06:58 1.167 @@ -571,7 +571,7 @@ current_conn = NULL; - apr_clear_pool(ptrans); + apr_pool_clear(ptrans); if ((ap_max_requests_per_child > 0 && requests_this_child++ >= ap_max_requests_per_child)) { 1.87 +1 -1 httpd-2.0/server/mpm/spmt_os2/spmt_os2.c Index: spmt_os2.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- spmt_os2.c 2001/02/16 04:26:51 1.86 +++ spmt_os2.c 2001/02/19 02:06:58 1.87 @@ -551,7 +551,7 @@ current_conn = NULL; - apr_clear_pool(ptrans); + apr_pool_clear(ptrans); if ((ap_max_requests_per_child > 0 && requests_this_child++ >= ap_max_requests_per_child)) { 1.3 +1 -1 httpd-2.0/server/mpm/threaded/threaded.c Index: threaded.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- threaded.c 2001/02/16 22:08:12 1.2 +++ threaded.c 2001/02/19 02:06:58 1.3 @@ -563,7 +563,7 @@ } break; } - apr_clear_pool(ptrans); + apr_pool_clear(ptrans); } apr_pool_destroy(tpool); 1.143 +2 -2 httpd-2.0/server/mpm/winnt/mpm_winnt.c Index: mpm_winnt.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- mpm_winnt.c 2001/02/16 04:26:52 1.142 +++ mpm_winnt.c 2001/02/19 02:06:58 1.143 @@ -743,7 +743,7 @@ while (1) { - apr_clear_pool(context->ptrans); + apr_pool_clear(context->ptrans); context->accept_socket = remove_job(); if (context->accept_socket == -1) { return NULL; @@ -892,7 +892,7 @@ int rc, i; /* reset the buffer pools */ - apr_clear_pool(context->ptrans); + apr_pool_clear(context->ptrans); context->sock = NULL; /* recreate and initialize the accept socket if it is not being reused */ 1.6 +1 -1 apr/include/apr_compat.h Index: apr_compat.h =================================================================== RCS file: /home/cvs/apr/include/apr_compat.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apr_compat.h 2001/02/08 07:44:44 1.5 +++ apr_compat.h 2001/02/19 02:06:59 1.6 @@ -19,7 +19,7 @@ #define ap_check_file_time apr_check_file_time #define ap_filetype_e apr_filetype_e #define ap_cleanup_for_exec apr_pool_cleanup_for_exec -#define ap_clear_pool apr_clear_pool +#define ap_clear_pool apr_pool_clear #define ap_clear_table apr_table_clear #define ap_copy_array apr_array_copy #define ap_copy_array_hdr apr_array_copy_hdr 1.44 +2 -2 apr/include/apr_pools.h Index: apr_pools.h =================================================================== RCS file: /home/cvs/apr/include/apr_pools.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- apr_pools.h 2001/02/16 04:15:47 1.43 +++ apr_pools.h 2001/02/19 02:06:59 1.44 @@ -291,9 +291,9 @@ * @param p The pool to clear * @tip This does not actually free the memory, it just allows the pool * to re-use this memory for the next allocation. - * @deffunc void apr_clear_pool(apr_pool_t *p) + * @deffunc void apr_pool_clear(apr_pool_t *p) */ -APR_DECLARE(void) apr_clear_pool(apr_pool_t *p); +APR_DECLARE(void) apr_pool_clear(apr_pool_t *p); /** * destroy the pool 1.88 +3 -3 apr/lib/apr_pools.c Index: apr_pools.c =================================================================== RCS file: /home/cvs/apr/lib/apr_pools.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- apr_pools.c 2001/02/16 04:15:53 1.87 +++ apr_pools.c 2001/02/19 02:06:59 1.88 @@ -712,13 +712,13 @@ apr_pool_destroy(globalp); } -/* We only want to lock the mutex if we are being called from apr_clear_pool. +/* We only want to lock the mutex if we are being called from apr_pool_clear. * This is because if we also call this function from apr_destroy_real_pool, * which also locks the same mutex, and recursive locks aren't portable. * This way, we are garaunteed that we only lock this mutex once when calling * either one of these functions. */ -APR_DECLARE(void) apr_clear_pool(apr_pool_t *a) +APR_DECLARE(void) apr_pool_clear(apr_pool_t *a) { while (a->sub_pools) { apr_pool_destroy(a->sub_pools); @@ -755,7 +755,7 @@ APR_DECLARE(void) apr_pool_destroy(apr_pool_t *a) { - apr_clear_pool(a); + apr_pool_clear(a); #if APR_HAS_THREADS if (alloc_mutex) { apr_lock_acquire(alloc_mutex);