Finish the APR naming cleanup. This removes the struct's from

apr_variable declarations.  This works on Unix, but a test compile
on other platforms would be a good idea.


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

1 files changed, 13 insertions, 13 deletions

diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index b148ad3d9..5ff0de439 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -594,7 +594,7 @@ static void ap_register_pool_cleanup(struct ap_pool_t *p, void *data,
 }
 #endif
 
-API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_register_cleanup(ap_context_t *p, void *data,
 				      ap_status_t (*plain_cleanup) (void *),
 				      ap_status_t (*child_cleanup) (void *))
 {
@@ -610,7 +610,7 @@ API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data,
     }
 }
 
-API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_kill_cleanup(ap_context_t *p, void *data,
 				  ap_status_t (*cleanup) (void *))
 {
     struct cleanup *c;
@@ -631,7 +631,7 @@ API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data,
     }
 }
 
-API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data,
+API_EXPORT(void) ap_run_cleanup(ap_context_t *p, void *data,
 				 ap_status_t (*cleanup) (void *))
 {
     ap_block_alarms();		/* Run cleanup only once! */
@@ -776,7 +776,7 @@ static void ap_clear_real_pool(ap_pool_t *a)
     ap_unblock_alarms();
 }
 
-API_EXPORT(void) ap_clear_pool(struct ap_context_t *a)
+API_EXPORT(void) ap_clear_pool(ap_context_t *a)
 {
     ap_clear_real_pool(a->pool);
 }
@@ -807,7 +807,7 @@ API_EXPORT(void) ap_destroy_real_pool(ap_pool_t *a)
     ap_unblock_alarms();
 }
 
-API_EXPORT(void) ap_destroy_pool(struct ap_context_t *a)
+API_EXPORT(void) ap_destroy_pool(ap_context_t *a)
 {
     ap_destroy_real_pool(a->pool);
 }
@@ -1024,7 +1024,7 @@ static void * ap_pool_palloc(ap_pool_t *a, int reqsize, int (*apr_abort)(int ret
 #endif
 }
 
-API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize)
+API_EXPORT(void *) ap_palloc(ap_context_t *c, int reqsize)
 {
     if (c == NULL) {
         return malloc(reqsize);
@@ -1032,14 +1032,14 @@ API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize)
     return ap_pool_palloc(c->pool, reqsize, c->apr_abort);
 }
 
-API_EXPORT(void *) ap_pcalloc(struct ap_context_t *a, int size)
+API_EXPORT(void *) ap_pcalloc(ap_context_t *a, int size)
 {
     void *res = ap_palloc(a, size);
     memset(res, '\0', size);
     return res;
 }
 
-API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s)
+API_EXPORT(char *) ap_pstrdup(ap_context_t *a, const char *s)
 {
     char *res;
     size_t len;
@@ -1053,7 +1053,7 @@ API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s)
     return res;
 }
 
-API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n)
+API_EXPORT(char *) ap_pstrndup(ap_context_t *a, const char *s, int n)
 {
     char *res;
 
@@ -1066,7 +1066,7 @@ API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n)
     return res;
 }
 
-API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *a, ...)
+API_EXPORT_NONSTD(char *) ap_pstrcat(ap_context_t *a, ...)
 {
     char *cp, *argp, *res;
 
@@ -1191,7 +1191,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff)
 #endif
 }
 
-API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list ap)
+API_EXPORT(char *) ap_pvsprintf(ap_context_t *c, const char *fmt, va_list ap)
 {
 #ifdef ALLOC_USE_MALLOC
     ap_pool_t *p = c->pool;
@@ -1256,7 +1256,7 @@ API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list
 #endif
 }
 
-API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...)
+API_EXPORT_NONSTD(char *) ap_psprintf(ap_context_t *p, const char *fmt, ...)
 {
     va_list ap;
     char *res;
@@ -1279,7 +1279,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, .
  * generic interface, but for now, it's a special case
  */
 
-API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid,
+API_EXPORT(void) ap_note_subprocess(ap_context_t *a, ap_proc_t *pid,
 				     enum kill_conditions how)
 {
     struct process_chain *new =