fix the rest of the struct foo_t to struct ap_foo_t. Next is removing the

struct's where possible.


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

9 files changed, 20 insertions, 20 deletions

diff --git a/misc/beos/misc.h b/misc/beos/misc.h
index 5840c3aaf..71d3fdb2a 100644
--- a/misc/beos/misc.h
+++ b/misc/beos/misc.h
@@ -79,7 +79,7 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct context_t {
+struct ap_context_t {
     struct ap_pool_t *pool;
     void *prog_data;
     int (*apr_abort)(int retcode);
diff --git a/misc/beos/start.c b/misc/beos/start.c
index f009e6a4d..32d8ebf08 100644
--- a/misc/beos/start.c
+++ b/misc/beos/start.c
@@ -54,7 +54,7 @@
 
 #include "misc.h"
 
-ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
+ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont)
 {
     ap_context_t *new;
     ap_pool_t *pool;
@@ -70,7 +70,7 @@ ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont
         return APR_ENOPOOL;
     }
     
-    new = (struct context_t *)ap_palloc(cont, sizeof(struct context_t));
+    new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t));
     
     new->pool = pool;
     new->prog_data = NULL;
@@ -87,7 +87,7 @@ ap_status_t ap_destroy_context(ap_context_t *cont)
 
 ap_status_t ap_set_userdata(void *data, char *key,
                             ap_status_t (*cleanup) (void *),
-                            struct context_t *cont)
+                            struct ap_context_t *cont)
 {
     datastruct *dptr = NULL, *dptr2 = NULL;
     if (cont) { 
@@ -117,7 +117,7 @@ ap_status_t ap_set_userdata(void *data, char *key,
     return APR_ENOCONT;
 }
 
-ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
 {
     datastruct *dptr = NULL;
     if (cont) { 
diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c
index 1bedb46d5..49f6049b4 100644
--- a/misc/unix/getopt.c
+++ b/misc/unix/getopt.c
@@ -60,7 +60,7 @@ char *ap_optarg = "";                   /* argument associated with option */
  * NOTE:  Arguments 2 and 3 are most commonly argc and argv from 
  *        main(argc, argv)
  */
-ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct context_t *cont)
+ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont)
 {
     char *p;
     static char *place = EMSG;   /* option letter processing */
diff --git a/misc/unix/misc.h b/misc/unix/misc.h
index aa6d1260f..fffa9365f 100644
--- a/misc/unix/misc.h
+++ b/misc/unix/misc.h
@@ -82,7 +82,7 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct context_t {
+struct ap_context_t {
     struct ap_pool_t *pool;
     datastruct *prog_data;
     int (*apr_abort)(int retcode);
diff --git a/misc/unix/start.c b/misc/unix/start.c
index c1d1cc0fc..95b3a3d60 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -64,9 +64,9 @@
  *        of it's parent context's attributes, except the ap_context_t will be a
  *        sub-pool.
  */
-ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
+ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont)
 {
-    struct context_t *new;
+    struct ap_context_t *new;
     ap_pool_t *pool;
 
     if (cont) {
@@ -80,7 +80,7 @@ ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont
         return APR_ENOPOOL;
     }   
 
-    new = (struct context_t *)ap_palloc(cont, sizeof(struct context_t));
+    new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t));
 
     new->pool = pool;
     new->prog_data = NULL;
@@ -95,7 +95,7 @@ ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont
  *    Free the context and all of it's child contexts'.
  * arg 1) The context to free.
  */
-ap_status_t ap_destroy_context(struct context_t *cont)
+ap_status_t ap_destroy_context(struct ap_context_t *cont)
 {
     ap_destroy_pool(cont);
     return APR_SUCCESS;
@@ -121,7 +121,7 @@ ap_status_t ap_destroy_context(struct context_t *cont)
  */
 ap_status_t ap_set_userdata(void *data, char *key,
                             ap_status_t (*cleanup) (void *),
-                            struct context_t *cont)
+                            struct ap_context_t *cont)
 {
     datastruct *dptr = NULL, *dptr2 = NULL;
     if (cont) { 
@@ -158,7 +158,7 @@ ap_status_t ap_set_userdata(void *data, char *key,
  * arg 2) The user data associated with the context.
  * arg 3) The current context.
  */
-ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
 {
     datastruct *dptr = NULL;
     if (cont) { 
@@ -215,7 +215,7 @@ void ap_terminate(void)
  *        then APR will return an error and expect the calling program to
  *        deal with the error accordingly.
  */
-ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct context_t *cont)
+ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct ap_context_t *cont)
 {
     if (cont == NULL) {
         return APR_ENOCONT;
diff --git a/misc/win32/getopt.c b/misc/win32/getopt.c
index 59544a76f..c17b41389 100644
--- a/misc/win32/getopt.c
+++ b/misc/win32/getopt.c
@@ -63,7 +63,7 @@ char *ap_optarg = "";                   /* argument associated with option */
  * NOTE:  Arguments 2 and 3 are most commonly argc and argv from 
  *        main(argc, argv)
  */
-ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct context_t *cont)
+ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont)
 {
     char *p;
     static char *place = EMSG;   /* option letter processing */
diff --git a/misc/win32/misc.h b/misc/win32/misc.h
index db9c1420a..a241c1e47 100644
--- a/misc/win32/misc.h
+++ b/misc/win32/misc.h
@@ -67,7 +67,7 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct context_t {
+struct ap_context_t {
     struct ap_pool_t *pool;
     datastruct *prog_data;
     int (*apr_abort)(int retcode);
diff --git a/misc/win32/names.c b/misc/win32/names.c
index f818f4e01..c06c21766 100644
--- a/misc/win32/names.c
+++ b/misc/win32/names.c
@@ -84,7 +84,7 @@ static BOOL OnlyDots(char *pString)
  * is present on the existing path.  This routine also
  * converts alias names to long names.
  */
-API_EXPORT(char *) ap_os_systemcase_filename(struct context_t *pCont, 
+API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont, 
                                              const char *szFile)
 {
     char buf[HUGE_STRING_LEN];
@@ -203,7 +203,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(struct context_t *pCont,
 /*  Perform canonicalization with the exception that the
  *  input case is preserved.
  */
-char * canonical_filename(struct context_t *pCont, const char *szFile)
+char * canonical_filename(struct ap_context_t *pCont, const char *szFile)
 {
     char *pNewStr;
     char *s;
diff --git a/misc/win32/start.c b/misc/win32/start.c
index 780ed828f..67d6041de 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -144,7 +144,7 @@ ap_status_t ap_get_oslevel(ap_context_t *cont, ap_oslevel_e *level)
 
 ap_status_t ap_set_userdata(void *data, char *key,
                             ap_status_t (*cleanup) (void *),
-                            struct context_t *cont)
+                            struct ap_context_t *cont)
 {
     datastruct *dptr = NULL, *dptr2 = NULL;
     if (cont) { 
@@ -174,7 +174,7 @@ ap_status_t ap_set_userdata(void *data, char *key,
     return APR_ENOCONT;
 }
 
-ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
+ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
 {
     datastruct *dptr = NULL;
     if (cont) {