diff options
author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-03 18:37:53 +0000 |
---|---|---|
committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-03 18:37:53 +0000 |
commit | 060c07c953c496b986f119fe4bda8ef894847bad (patch) | |
tree | eb578daea2f5dee7a2b73b25eb7d06846387863a /lib | |
parent | e675453044d65b2da994396284e37db866e26d41 (diff) | |
download | libapr-060c07c953c496b986f119fe4bda8ef894847bad.tar.gz |
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/apr_pools.c | 26 | ||||
-rw-r--r-- | lib/apr_tables.c | 18 |
2 files changed, 22 insertions, 22 deletions
diff --git a/lib/apr_pools.c b/lib/apr_pools.c index 522aba584..4e1045466 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -598,7 +598,7 @@ static void ap_register_pool_cleanup(struct ap_pool_t *p, void *data, } #endif -API_EXPORT(void) ap_register_cleanup(struct context_t *p, void *data, +API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data, ap_status_t (*plain_cleanup) (void *), ap_status_t (*child_cleanup) (void *)) { @@ -614,7 +614,7 @@ API_EXPORT(void) ap_register_cleanup(struct context_t *p, void *data, } } -API_EXPORT(void) ap_kill_cleanup(struct context_t *p, void *data, +API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { struct cleanup *c; @@ -635,7 +635,7 @@ API_EXPORT(void) ap_kill_cleanup(struct context_t *p, void *data, } } -API_EXPORT(void) ap_run_cleanup(struct context_t *p, void *data, +API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data, ap_status_t (*cleanup) (void *)) { ap_block_alarms(); /* Run cleanup only once! */ @@ -780,7 +780,7 @@ static void ap_clear_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_clear_pool(struct context_t *a) +API_EXPORT(void) ap_clear_pool(struct ap_context_t *a) { ap_clear_real_pool(a->pool); } @@ -811,7 +811,7 @@ API_EXPORT(void) ap_destroy_real_pool(ap_pool_t *a) ap_unblock_alarms(); } -API_EXPORT(void) ap_destroy_pool(struct context_t *a) +API_EXPORT(void) ap_destroy_pool(struct ap_context_t *a) { ap_destroy_real_pool(a->pool); } @@ -1028,7 +1028,7 @@ static void * ap_pool_palloc(ap_pool_t *a, int reqsize, int (*apr_abort)(int ret #endif } -API_EXPORT(void *) ap_palloc(struct context_t *c, int reqsize) +API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize) { if (c == NULL) { return malloc(reqsize); @@ -1036,14 +1036,14 @@ API_EXPORT(void *) ap_palloc(struct context_t *c, int reqsize) return ap_pool_palloc(c->pool, reqsize, c->apr_abort); } -API_EXPORT(void *) ap_pcalloc(struct context_t *a, int size) +API_EXPORT(void *) ap_pcalloc(struct ap_context_t *a, int size) { void *res = ap_palloc(a, size); memset(res, '\0', size); return res; } -API_EXPORT(char *) ap_pstrdup(struct context_t *a, const char *s) +API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s) { char *res; size_t len; @@ -1057,7 +1057,7 @@ API_EXPORT(char *) ap_pstrdup(struct context_t *a, const char *s) return res; } -API_EXPORT(char *) ap_pstrndup(struct context_t *a, const char *s, int n) +API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n) { char *res; @@ -1070,7 +1070,7 @@ API_EXPORT(char *) ap_pstrndup(struct context_t *a, const char *s, int n) return res; } -API_EXPORT_NONSTD(char *) ap_pstrcat(struct context_t *a, ...) +API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *a, ...) { char *cp, *argp, *res; @@ -1195,7 +1195,7 @@ static int psprintf_flush(ap_vformatter_buff_t *vbuff) #endif } -API_EXPORT(char *) ap_pvsprintf(struct context_t *c, const char *fmt, va_list ap) +API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list ap) { #ifdef ALLOC_USE_MALLOC ap_pool_t *p = c->pool; @@ -1260,7 +1260,7 @@ API_EXPORT(char *) ap_pvsprintf(struct context_t *c, const char *fmt, va_list ap #endif } -API_EXPORT_NONSTD(char *) ap_psprintf(struct context_t *p, const char *fmt, ...) +API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...) { va_list ap; char *res; @@ -1283,7 +1283,7 @@ API_EXPORT_NONSTD(char *) ap_psprintf(struct context_t *p, const char *fmt, ...) * generic interface, but for now, it's a special case */ -API_EXPORT(void) ap_note_subprocess(struct context_t *a, ap_proc_t *pid, +API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid, enum kill_conditions how) { struct process_chain *new = diff --git a/lib/apr_tables.c b/lib/apr_tables.c index 0aee2d193..5b8198e48 100644 --- a/lib/apr_tables.c +++ b/lib/apr_tables.c @@ -88,7 +88,7 @@ * The 'array' functions... */ -static void make_array_core(ap_array_header_t *res, struct context_t *c, +static void make_array_core(ap_array_header_t *res, struct ap_context_t *c, int nelts, int elt_size) { /* @@ -107,7 +107,7 @@ static void make_array_core(ap_array_header_t *res, struct context_t *c, res->nalloc = nelts; /* ...but this many allocated */ } -API_EXPORT(ap_array_header_t *) ap_make_array(struct context_t *p, +API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_context_t *p, int nelts, int elt_size) { ap_array_header_t *res; @@ -159,7 +159,7 @@ API_EXPORT(void) ap_array_cat(ap_array_header_t *dst, dst->nelts += src->nelts; } -API_EXPORT(ap_array_header_t *) ap_copy_array(struct context_t *p, +API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_context_t *p, const ap_array_header_t *arr) { ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size); @@ -186,7 +186,7 @@ static APR_INLINE void copy_array_hdr_core(ap_array_header_t *res, } API_EXPORT(ap_array_header_t *) - ap_copy_array_hdr(struct context_t *p, + ap_copy_array_hdr(struct ap_context_t *p, const ap_array_header_t *arr) { ap_array_header_t *res; @@ -200,7 +200,7 @@ API_EXPORT(ap_array_header_t *) /* The above is used here to avoid consing multiple new array bodies... */ API_EXPORT(ap_array_header_t *) - ap_append_arrays(struct context_t *p, + ap_append_arrays(struct ap_context_t *p, const ap_array_header_t *first, const ap_array_header_t *second) { @@ -216,7 +216,7 @@ API_EXPORT(ap_array_header_t *) * or if there are no elements in the array. * If sep is non-NUL, it will be inserted between elements as a separator. */ -API_EXPORT(char *) ap_array_pstrcat(struct context_t *p, +API_EXPORT(char *) ap_array_pstrcat(struct ap_context_t *p, const ap_array_header_t *arr, const char sep) { @@ -293,7 +293,7 @@ static ap_table_entry_t *table_push(ap_table_t *t) #endif /* MAKE_TABLE_PROFILE */ -API_EXPORT(ap_table_t *) ap_make_table(struct context_t *p, int nelts) +API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts) { ap_table_t *t = ap_palloc(p, sizeof(ap_table_t)); @@ -304,7 +304,7 @@ API_EXPORT(ap_table_t *) ap_make_table(struct context_t *p, int nelts) return t; } -API_EXPORT(ap_table_t *) ap_copy_table(struct context_t *p, const ap_table_t *t) +API_EXPORT(ap_table_t *) ap_copy_table(struct ap_context_t *p, const ap_table_t *t) { ap_table_t *new = ap_palloc(p, sizeof(ap_table_t)); @@ -534,7 +534,7 @@ API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key, elts->val = (char *)val; } -API_EXPORT(ap_table_t *) ap_overlay_tables(struct context_t *p, +API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_context_t *p, const ap_table_t *overlay, const ap_table_t *base) { |