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: http://svn.apache.org/repos/asf/apr/apr/trunk@60960 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 7 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index ab285e3ac..d2117670a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 Changes with APR b1
+  *) Rename apr_opendir to apr_dir_open.  [Ryan Bloom]
 
   *) apr_snprintf()'s %pI format string now takes apr_sockaddr_t *
      instead of sockaddr_in *.  [Jeff Trawick]
diff --git a/STATUS b/STATUS
index f4ce855b6..886051c68 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:			-*-text-*-
-Last modified at [$Date: 2000/12/17 03:08:44 $]
+Last modified at [$Date: 2000/12/17 03:35:39 $]
 
 Release:
 
@@ -18,9 +18,6 @@ RELEASE SHOWSTOPPERS:
       has been some discussion about adding a src/ directory to apr or 
       removing it from apr-util/.  Either way, this needs to be decided.
 
-    * Rename Symbols:
-		apr_opendir   -->    apr_dir_open
-
 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 
     * SysV semaphore support isn't usable by Apache when started as
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index 299a70c1e..3d9a47687 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -69,7 +69,7 @@ static apr_status_t dir_cleanup(void *thedir)
 
 
 
-apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cntxt)
+apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cntxt)
 {
     apr_dir_t *thedir = (apr_dir_t *)apr_palloc(cntxt, sizeof(apr_dir_t));
     
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index 419c2f881..2b4d89c18 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -67,7 +67,7 @@ static apr_status_t dir_cleanup(void *thedir)
     }
 } 
 
-apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
+apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
 {
     /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct 
      * dirent is declared with enough storage for the name.  On other
diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c
index 99dbd51b2..508781813 100644
--- a/file_io/win32/dir.c
+++ b/file_io/win32/dir.c
@@ -82,7 +82,7 @@ apr_status_t dir_cleanup(void *thedir)
     return APR_SUCCESS;
 } 
 
-apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
+apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
 {
     /* Note that we won't open a directory that is greater than MAX_PATH,
      * including the trailing /* wildcard suffix.  If a * won't fit, then
diff --git a/include/apr_file_io.h b/include/apr_file_io.h
index d5740cb9d..1c47e5b8d 100644
--- a/include/apr_file_io.h
+++ b/include/apr_file_io.h
@@ -643,7 +643,7 @@ apr_status_t apr_seek(apr_file_t *thefile, apr_seek_where_t where,apr_off_t *off
  * @param dirname The full path to the directory (use / on all systems)
  * @param cont The pool to use.
  */                        
-apr_status_t apr_opendir(apr_dir_t **new_dir, const char *dirname, apr_pool_t *cont);
+apr_status_t apr_dir_open(apr_dir_t **new_dir, const char *dirname, apr_pool_t *cont);
 
 /**
  * close the specified directory. 
diff --git a/test/testfile.c b/test/testfile.c
index 4a2868c90..3998d2625 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -302,7 +302,7 @@ int testdirs(apr_pool_t *context)
 	apr_close(file);
 
     fprintf(stdout, "\tOpening Directory.......");
-    if (apr_opendir(&temp, "testdir", context) != APR_SUCCESS) {
+    if (apr_dir_open(&temp, "testdir", context) != APR_SUCCESS) {
         fprintf(stderr, "Could not open directory\n");
         return -1;
     }