Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages

on Linux, but probably breaks somewhere.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59856 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 78 insertions, 83 deletions

diff --git a/locks/beos/crossproc.c b/locks/beos/crossproc.c
index d5f7a6db8..388dba8ed 100644
--- a/locks/beos/crossproc.c
+++ b/locks/beos/crossproc.c
@@ -123,8 +123,7 @@ ap_status_t destroy_inter_lock(ap_lock_t *lock)
     return stat;
 }
 
-ap_status_t child_init_lock(ap_lock_t **lock, ap_context_t *cont,
-                            const char *fname)
+ap_status_t child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
 {
     return APR_SUCCESS;
 }
diff --git a/locks/beos/locks.c b/locks/beos/locks.c
index 50a0a2dee..48d8c07aa 100644
--- a/locks/beos/locks.c
+++ b/locks/beos/locks.c
@@ -55,8 +55,8 @@
 #include "locks.h"
 
 ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
-                           ap_lockscope_e scope, const char *fname, 
-                           ap_context_t *cont)
+                           ap_lockscope_e scope, char *fname, 
+                           ap_pool_t *cont)
 {
     ap_lock_t *new;
     ap_status_t stat;
@@ -134,8 +134,7 @@ ap_status_t ap_destroy_lock(ap_lock_t *lock)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
-                               ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_pool_t *cont)
 {
     ap_status_t stat;
     if ((*lock)->scope != APR_CROSS_PROCESS) {
diff --git a/locks/beos/locks.h b/locks/beos/locks.h
index d88f2fcde..0160b5e71 100644
--- a/locks/beos/locks.h
+++ b/locks/beos/locks.h
@@ -62,7 +62,7 @@
 #include "apr_lib.h"
 
 struct ap_lock_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
     int curr_locked;
diff --git a/locks/os2/locks.c b/locks/os2/locks.c
index c2114c83c..4272a164b 100644
--- a/locks/os2/locks.c
+++ b/locks/os2/locks.c
@@ -77,8 +77,7 @@ static ap_status_t lock_cleanup(void *thelock)
 
 
 
-ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, 
-                           const char *fname, ap_context_t *cont)
+ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_pool_t *cont)
 {
     ap_lock_t *new;
     ULONG rc;
@@ -110,7 +109,7 @@ ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e
 
 
 
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, char *fname, ap_pool_t *cont)
 {
     int rc;
     PIB *ppib;
diff --git a/locks/os2/locks.h b/locks/os2/locks.h
index 9dcf0f293..d416b6b08 100644
--- a/locks/os2/locks.h
+++ b/locks/os2/locks.h
@@ -61,7 +61,7 @@
 #include <os2.h>
 
 struct ap_lock_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
     char *fname;
diff --git a/locks/unix/crossproc.c b/locks/unix/crossproc.c
index 6ec5c4e31..cddd80f4a 100644
--- a/locks/unix/crossproc.c
+++ b/locks/unix/crossproc.c
@@ -130,8 +130,7 @@ ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
     return stat;
 }
 
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
-                            const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
 {
     return APR_SUCCESS;
 }
@@ -231,8 +230,7 @@ ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
     return stat;
 }
 
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
-                            const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, char *fname)
 {
     return APR_SUCCESS;
 }
@@ -312,8 +310,8 @@ ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
     return stat;
 }
 
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
-                            const char *fname)
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, 
+                                    const char *fname)
 {
     return APR_SUCCESS;
 }
@@ -379,7 +377,7 @@ ap_status_t ap_unix_destroy_inter_lock(ap_lock_t *lock)
     return stat;
 }
 
-ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_context_t *cont,
+ap_status_t ap_unix_child_init_lock(ap_lock_t **lock, ap_pool_t *cont, 
                             const char *fname)
 {
     ap_lock_t *new;
diff --git a/locks/unix/locks.c b/locks/unix/locks.c
index 365eb3582..c550dfea9 100644
--- a/locks/unix/locks.c
+++ b/locks/unix/locks.c
@@ -56,8 +56,8 @@
 #include "apr_portable.h"
 
 ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
-                           ap_lockscope_e scope, const char *fname, 
-                           ap_context_t *cont)
+                           ap_lockscope_e scope, char *fname, 
+                           ap_pool_t *cont)
 {
     ap_lock_t *new;
     ap_status_t stat;
@@ -159,8 +159,8 @@ ap_status_t ap_destroy_lock(ap_lock_t *lock)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
-                               ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
+                               ap_pool_t *cont)
 {
     ap_status_t stat;
     if ((*lock)->scope != APR_CROSS_PROCESS) {
@@ -210,7 +210,7 @@ ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock)
 }
 
 ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
-                           ap_context_t *cont)
+                           ap_pool_t *cont)
 {
     if (cont == NULL) {
         return APR_ENOCONT;
diff --git a/locks/unix/locks.h b/locks/unix/locks.h
index 9938d6797..e10d89086 100644
--- a/locks/unix/locks.h
+++ b/locks/unix/locks.h
@@ -109,7 +109,7 @@ union semun {
 #endif
 
 struct ap_lock_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
     int curr_locked;
@@ -150,7 +150,7 @@ ap_status_t ap_unix_lock_inter(struct ap_lock_t *lock);
 ap_status_t ap_unix_unlock_inter(struct ap_lock_t *lock);
 ap_status_t ap_unix_destroy_inter_lock(struct ap_lock_t *lock);
 
-ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, 
+ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_pool_t *cont, 
                             const char *fname);
 
 #endif  /* LOCKS_H */
diff --git a/locks/win32/locks.c b/locks/win32/locks.c
index 300877c67..d841ea419 100644
--- a/locks/win32/locks.c
+++ b/locks/win32/locks.c
@@ -1,56 +1,56 @@
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+* The Apache Software License, Version 1.1
+*
+* Copyright (c) 2000 The Apache Software Foundation.  All rights
+* reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+*
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in
+*    the documentation and/or other materials provided with the
+*    distribution.
+*
+* 3. The end-user documentation included with the redistribution,
+*    if any, must include the following acknowledgment:
+*       "This product includes software developed by the
+*        Apache Software Foundation (http://www.apache.org/)."
+*    Alternately, this acknowledgment may appear in the software itself,
+*    if and wherever such third-party acknowledgments normally appear.
+*
+* 4. The names "Apache" and "Apache Software Foundation" must
+*    not be used to endorse or promote products derived from this
+*    software without prior written permission. For written
+*    permission, please contact apache@apache.org.
+*
+* 5. Products derived from this software may not be called "Apache",
+*    nor may "Apache" appear in their name, without prior written
+*    permission of the Apache Software Foundation.
+*
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+* ====================================================================
+*
+* This software consists of voluntary contributions made by many
+* individuals on behalf of the Apache Software Foundation.  For more
+* information on the Apache Software Foundation, please see
+* <http://www.apache.org/>.
+*/
 
 #include "apr_general.h"
 #include "apr_lib.h"
@@ -58,8 +58,8 @@
 #include "apr_portable.h"
 
 ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
-                           ap_lockscope_e scope, const char *fname, 
-                           ap_context_t *cont)
+                           ap_lockscope_e scope, char *fname, 
+                           ap_pool_t *cont)
 {
     ap_lock_t *newlock;
     SECURITY_ATTRIBUTES sec;
@@ -92,8 +92,8 @@ ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type,
     return APR_SUCCESS;
 }
 
-ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname,
-                               ap_context_t *cont)
+ap_status_t ap_child_init_lock(ap_lock_t **lock, const char *fname, 
+                               ap_pool_t *cont)
 {
     /* This routine should not be called (and OpenMutex will fail if called) 
      * on a INTRAPROCESS lock
@@ -190,7 +190,7 @@ ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, ap_lock_t *lock)
 }
 
 ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
-                           ap_context_t *cont)
+                           ap_pool_t *cont)
 {
     if (cont == NULL) {
         return APR_ENOCONT;
diff --git a/locks/win32/locks.h b/locks/win32/locks.h
index 7c89002f0..602c2eb67 100644
--- a/locks/win32/locks.h
+++ b/locks/win32/locks.h
@@ -58,7 +58,7 @@
 #include "apr_lock.h"
 
 struct ap_lock_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
     HANDLE mutex;