diff options
| author | Doug MacEachern <dougm@apache.org> | 2001-02-08 08:45:33 +0100 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2001-02-08 08:45:33 +0100 |
| commit | 88d3406f9a35c503b9f0e3f125aacdaa05df9371 (patch) | |
| tree | 39470637773d75d2fc514c333a1af2554f92775c /modules/mappers/mod_dir.c | |
| parent | scoreboard.h says it is extern (and scoreboard.c instantiates it), (diff) | |
| download | apache2-88d3406f9a35c503b9f0e3f125aacdaa05df9371.tar.xz apache2-88d3406f9a35c503b9f0e3f125aacdaa05df9371.zip | |
renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/mappers/mod_dir.c')
| -rw-r--r-- | modules/mappers/mod_dir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c index 15e777154c..7dd48d55dd 100644 --- a/modules/mappers/mod_dir.c +++ b/modules/mappers/mod_dir.c @@ -84,9 +84,9 @@ static const char *add_index(cmd_parms *cmd, void *dummy, const char *arg) dir_config_rec *d = dummy; if (!d->index_names) { - d->index_names = apr_make_array(cmd->pool, 2, sizeof(char *)); + d->index_names = apr_array_make(cmd->pool, 2, sizeof(char *)); } - *(const char **)apr_push_array(d->index_names) = arg; + *(const char **)apr_array_push(d->index_names) = arg; return NULL; } @@ -187,10 +187,10 @@ static int handle_dir(request_rec *r) apr_pool_join(r->pool, rr->pool); error_notfound = rr->status; - r->notes = apr_overlay_tables(r->pool, r->notes, rr->notes); - r->headers_out = apr_overlay_tables(r->pool, r->headers_out, + r->notes = apr_table_overlay(r->pool, r->notes, rr->notes); + r->headers_out = apr_table_overlay(r->pool, r->headers_out, rr->headers_out); - r->err_headers_out = apr_overlay_tables(r->pool, r->err_headers_out, + r->err_headers_out = apr_table_overlay(r->pool, r->err_headers_out, rr->err_headers_out); return error_notfound; } |