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

on Linux, but probably breaks somewhere.


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

16 files changed, 43 insertions, 40 deletions

diff --git a/test/ab_apr.c b/test/ab_apr.c
index 6a46fa524..53d284cca 100644
--- a/test/ab_apr.c
+++ b/test/ab_apr.c
@@ -190,7 +190,7 @@ char buffer[8192];
 
 struct connection *con;		/* connection array */
 struct data *stats;		/* date for each request */
-ap_context_t *cntxt;
+ap_pool_t *cntxt;
 
 ap_pollfd_t *readbits;
 
@@ -888,7 +888,7 @@ int main(int argc, char **argv)
 
     ap_initialize();
     atexit(ap_terminate);
-    ap_create_context(&cntxt, NULL);
+    ap_create_pool(&cntxt, NULL);
 
     ap_optind = 1;
     while (ap_getopt(argc, argv, "n:c:t:T:p:v:kVhwx:y:z:", &c, cntxt) == APR_SUCCESS) {
diff --git a/test/abc.c b/test/abc.c
index 0c5b22b87..eeb215e6a 100644
--- a/test/abc.c
+++ b/test/abc.c
@@ -9,9 +9,9 @@ int main(int argc, char *argv[])
     ap_file_t *fd = NULL;
     char ch;
     int status = 0;
-    ap_context_t *context;
+    ap_pool_t *context;
 
-    ap_create_context(&context, NULL); 
+    ap_create_pool(&context, NULL); 
 
     ap_open(&fd, argv[1], APR_READ, -1, context);
     
diff --git a/test/client.c b/test/client.c
index ebc0648e1..dfc2c80d1 100644
--- a/test/client.c
+++ b/test/client.c
@@ -62,7 +62,7 @@
 
 int main(int argc, char *argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_socket_t *sock;
     ap_ssize_t length;
     ap_status_t stat;
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
     atexit(ap_terminate);
 
     fprintf(stdout, "Creating context.......");
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Something went wrong\n");
         exit(-1);
     }
diff --git a/test/htdigest.c b/test/htdigest.c
index 3501ae5f6..d9b895c13 100644
--- a/test/htdigest.c
+++ b/test/htdigest.c
@@ -97,7 +97,7 @@
 #define MAX_STRING_LEN 256
 
 char *tn;
-ap_context_t *cntxt;
+ap_pool_t *cntxt;
 
 static void getword(char *word, char *line, char stop)
 {
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
     char command[MAX_STRING_LEN];
     int found;
     
-    ap_create_context(&cntxt, NULL);
+    ap_create_pool(&cntxt, NULL);
 
     tn = NULL;
     ap_signal(SIGINT, (void (*)(int)) interrupted);
diff --git a/test/server.c b/test/server.c
index 032337f7e..3207915f6 100644
--- a/test/server.c
+++ b/test/server.c
@@ -61,7 +61,7 @@
 
 int main(int argc, char *argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_socket_t *sock;
     ap_socket_t *sock2;
     ap_ssize_t length;
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
     atexit(ap_terminate);
 
     fprintf(stdout, "Creating context.......");
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Could not create a context\n");
         exit(-1);
     }
diff --git a/test/testargs.c b/test/testargs.c
index df4b6bd2d..52ddf668f 100644
--- a/test/testargs.c
+++ b/test/testargs.c
@@ -65,12 +65,12 @@
 
 int main(int argc, char * const argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_int32_t data;
 
     ap_initialize();
     atexit(ap_terminate);
-    ap_create_context(&context, NULL);
+    ap_create_pool(&context, NULL);
 
     while (ap_getopt(argc, argv, "abc:d::", &data, context) == APR_SUCCESS) {
         switch(data) {
diff --git a/test/testcontext.c b/test/testcontext.c
index 42401c1dd..0c91d5080 100644
--- a/test/testcontext.c
+++ b/test/testcontext.c
@@ -69,7 +69,7 @@ ap_status_t string_cleanup(void *data)
 
 int main()
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     char *testdata;
     char *retdata;
 
@@ -79,7 +79,7 @@ int main()
     }
     atexit(ap_terminate);
 
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
diff --git a/test/testdso.c b/test/testdso.c
index cdebeb698..d34b2a78d 100644
--- a/test/testdso.c
+++ b/test/testdso.c
@@ -13,7 +13,7 @@ int main (int argc, char ** argv)
     ap_dso_handle_t *h = NULL;
     ap_dso_handle_sym_t func1 = NULL;
     ap_dso_handle_sym_t func2 = NULL;
-    ap_context_t *cont;
+    ap_pool_t *cont;
     void (*function)(void);
     void (*function1)(int);
     int *retval;
@@ -26,7 +26,7 @@ int main (int argc, char ** argv)
     ap_initialize();
     atexit(ap_terminate);
         
-    if (ap_create_context(&cont, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&cont, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
diff --git a/test/testfile.c b/test/testfile.c
index c4660fabb..1b164515e 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -62,13 +62,13 @@
 #include <unistd.h>
 #endif
 
-int test_filedel(ap_context_t *);
-int testdirs(ap_context_t *);
+int test_filedel(ap_pool_t *);
+int testdirs(ap_pool_t *);
 
 int main()
 {
-    ap_context_t *context;
-    ap_context_t *cont2;
+    ap_pool_t *context;
+    ap_pool_t *cont2;
     ap_file_t *thefile = NULL;
     ap_status_t status = 0;
     ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
@@ -84,11 +84,11 @@ int main()
         exit(-1);
     }
     atexit(ap_terminate);
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
-    if (ap_create_context(&cont2, context) != APR_SUCCESS) {
+    if (ap_create_pool(&cont2, context) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
@@ -214,7 +214,7 @@ int main()
     return 1;
 }
 
-int test_filedel(ap_context_t *context)
+int test_filedel(ap_pool_t *context)
 {
     ap_file_t *thefile = NULL;
     ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
@@ -241,7 +241,7 @@ int test_filedel(ap_context_t *context)
     return APR_SUCCESS;
 }
 
-int testdirs(ap_context_t *context)
+int testdirs(ap_pool_t *context)
 {
     ap_dir_t *temp;  
     ap_file_t *file = NULL;
diff --git a/test/testmmap.c b/test/testmmap.c
index f4310661b..3f58ec3c6 100644
--- a/test/testmmap.c
+++ b/test/testmmap.c
@@ -69,7 +69,7 @@
 
 int main()
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_mmap_t *themmap = NULL;
     ap_file_t *thefile = NULL;
     ap_finfo_t finfo;
@@ -87,7 +87,7 @@ int main()
     atexit(ap_terminate);
 
     fprintf(stdout,"Creating context....................");    
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Failed.\n");
         exit(-1);
     }
diff --git a/test/testoc.c b/test/testoc.c
index ad15eb5e0..60b32bbf7 100644
--- a/test/testoc.c
+++ b/test/testoc.c
@@ -85,7 +85,10 @@ void ocmaint(int reason, void *data)
 
 int main(int argc, char *argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
+    ap_pool_t *cont2;
+    ap_status_t status = 0;
+    ap_ssize_t nbytes = 0;
     ap_proc_t *newproc = NULL;
     ap_procattr_t *procattr = NULL;
     char *args[3];
@@ -99,7 +102,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
     atexit(ap_terminate);
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
diff --git a/test/testpipe.c b/test/testpipe.c
index 81d25a902..fe85ad746 100644
--- a/test/testpipe.c
+++ b/test/testpipe.c
@@ -62,12 +62,12 @@
 #include <unistd.h>
 #endif
 
-int test_filedel(ap_context_t *);
-int testdirs(ap_context_t *);
+int test_filedel(ap_pool_t *);
+int testdirs(ap_pool_t *);
 
 int main()
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_file_t *readp = NULL;
     ap_file_t *writep = NULL;
     ap_size_t nbytes;
@@ -78,7 +78,7 @@ int main()
         exit(-1);
     }
     atexit(ap_terminate);
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
diff --git a/test/testproc.c b/test/testproc.c
index 574b58511..74903d246 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -70,7 +70,7 @@ int testdirs(void);
 
 int main(int argc, char *argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
     ap_proc_t *newproc;
     ap_procattr_t *attr;
     ap_file_t *testfile = NULL;
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
     atexit(ap_terminate);
-    ap_create_context(&context, NULL);
+    ap_create_pool(&context, NULL);
 
 
     if (argc > 1) {
diff --git a/test/testshmem.c b/test/testshmem.c
index d616a6a30..702b8b91e 100644
--- a/test/testshmem.c
+++ b/test/testshmem.c
@@ -70,7 +70,7 @@ typedef struct mbox {
     char msg[1024]; 
     int msgavail; 
 } mbox;
-ap_context_t *context;
+ap_pool_t *context;
 mbox *boxes;
 
 void msgwait(int boxnum)
@@ -100,7 +100,7 @@ int main()
     ap_initialize();
 
     fprintf(stdout, "Initializing the context......."); 
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "could not initialize\n");
         exit(-1);
     }
diff --git a/test/testsock.c b/test/testsock.c
index 5800ca71f..98f164480 100644
--- a/test/testsock.c
+++ b/test/testsock.c
@@ -64,7 +64,7 @@
 
 int main(int argc, char *argv[])
 {
-    ap_context_t *context;
+    ap_pool_t *context;
 
     ap_procattr_t *attr1 = NULL;
     ap_procattr_t *attr2 = NULL;
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     atexit(ap_terminate);
 
     fprintf(stdout, "Creating context.......");
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Could not create context\n");
         exit(-1);
     }
diff --git a/test/testthread.c b/test/testthread.c
index 76110426b..f82f496ce 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -70,7 +70,7 @@ void * API_THREAD_FUNC thread_func4(void *data);
 
 
 ap_lock_t *thread_lock;
-ap_context_t *context;
+ap_pool_t *context;
 int x = 0;
 
 void * API_THREAD_FUNC thread_func1(void *data)
@@ -131,7 +131,7 @@ int main()
     ap_initialize();
 
     fprintf(stdout, "Initializing the context......."); 
-    if (ap_create_context(&context, NULL) != APR_SUCCESS) {
+    if (ap_create_pool(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "could not initialize\n");
         exit(-1);
     }