Rename the apr_opendir symbol to apr_dir_open. This makes more sense,

and the rename was proposed a while ago inside of APR.

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

diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index 6030ca5b44e2089345bfa3e5328bce0428f3a020..d3f89e70412fefe409e08dd0ff76647e384d4708 100644 (file)
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -1352,7 +1352,7 @@ static dav_error * dav_fs_walker(dav_fs_walker_context *fsctx, int depth)
     fsctx->res2.collection = 0;
 
     /* open and scan the directory */
-    if ((apr_opendir(&dirp, fsctx->path1.buf, pool)) != APR_SUCCESS) {
+    if ((apr_dir_open(&dirp, fsctx->path1.buf, pool)) != APR_SUCCESS) {
        /* ### need a better error */
        return dav_new_error(pool, HTTP_NOT_FOUND, 0, NULL);
     }

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index e0afbc4f8f427b268b932e16efc432b2b998deba..fc53e47ffee94c41e92eeea0a892598fbaf8e806 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1551,7 +1551,7 @@ static int index_directory(request_rec *r,
     char keyid;
     char direction;
 
-    if ((status = apr_opendir(&d, name, r->pool)) != APR_SUCCESS) {
+    if ((status = apr_dir_open(&d, name, r->pool)) != APR_SUCCESS) {
        ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
                    "Can't open directory for index: %s", r->filename);
        return HTTP_FORBIDDEN;

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 160fdf0e3eaf87fe922421a06c3bbda8d1c9ccd2..99525020c5ebca7e0110a51e5baa81a99e10168e 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -930,7 +930,7 @@ static int read_types_multi(negotiation_state *neg)
     ++filp;
     prefix_len = strlen(filp);
 
-    if ((status = apr_opendir(&dirp, neg->dir_name, neg->pool)) != APR_SUCCESS) {
+    if ((status = apr_dir_open(&dirp, neg->dir_name, neg->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
                     "cannot read directory for multi: %s", neg->dir_name);
         return HTTP_FORBIDDEN;

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index c3468038f5ad000f5d28cf308f8efffe41a3bfc2..81f4cee242c982c92c3aaf7bbdc84f4c2dc5b23e 100644 (file)
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -297,7 +297,7 @@ static int check_speling(request_rec *r)
     url = apr_pstrndup(r->pool, r->uri, (urlen - pglen));
 
     /* Now open the directory and do ourselves a check... */
-    if (apr_opendir(&dir, good, r->pool) != APR_SUCCESS) {
+    if (apr_dir_open(&dir, good, r->pool) != APR_SUCCESS) {
         /* Oops, not a directory... */
         return DECLINED;
     }

diff --git a/modules/test/mod_autoindex.c b/modules/test/mod_autoindex.c
index 793fa19de4936f689683fb18edcde9d6b1bc4115..1be1080d8104a49a74f5cc9a83c76f703e728f74 100644 (file)
--- a/modules/test/mod_autoindex.c
+++ b/modules/test/mod_autoindex.c
@@ -1551,7 +1551,7 @@ static int index_directory(request_rec *r,
     char keyid;
     char direction;
 
-    if ((status = apr_opendir(&d, name, r->pool)) != APR_SUCCESS) {
+    if ((status = apr_dir_open(&d, name, r->pool)) != APR_SUCCESS) {
        ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
                    "Can't open directory for index: %s", r->filename);
        return HTTP_FORBIDDEN;

diff --git a/server/config.c b/server/config.c
index 2b75b29744e73cfbef31db7b764e08dea5763a60..2e3eba39268f5372db7f92a2ce07a92bde7aa2f2 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1381,7 +1381,7 @@ void ap_process_resource_config(server_rec *s, const char *fname,
         * for this.
         */
        fprintf(stderr, "Processing config directory: %s\n", fname);
-       if (apr_opendir(&dirp, fname, p) != APR_SUCCESS) {
+       if (apr_dir_open(&dirp, fname, p) != APR_SUCCESS) {
            perror("fopen");
            fprintf(stderr, "%s: could not open config directory %s\n",
                ap_server_argv0, fname);