Commit b1be11c2 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent b95a27b2

modules/dav/fs/repos.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

modules/generators/mod_autoindex.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

modules/mappers/mod_negotiation.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

modules/mappers/mod_speling.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

modules/test/mod_autoindex.c

+1 −1
Original line number Diff line number Diff line
@@ -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;