*) Renames done (deprecated functions wrapped):

     apr_filename_of_pathname -> apr_filepath_name_get
     apr_get_groupid -> apr_gid_get
     apr_get_groupname -> apr_gid_name_get
     apr_compare_groups -> apr_gid_compare
     apr_parse_addr_port -> apr_port_addr_parse
     apr_shutdown -> apr_socket_shutdown
     apr_bind -> apr_socket_bind
     apr_listen -> apr_socket_listen
     apr_accept -> apr_socket_accept
     apr_connect -> apr_socket_connect
     apr_send -> apr_socket_send
     apr_sendv -> apr_socket_sendv
     apr_sendto -> apr_socket_sendto
     apr_implode_gmt -> apr_time_exp_gmt_get
     apr_get_home_directory -> apr_uid_homepath_get
     apr_get_userid -> apr_uid_get
     apr_current_userid -> apr_uid_current
     apr_compare_users -> apr_uid_compare
     apr_get_username -> apr_uid_name_get
     apr_recvfrom -> apr_socket_recvfrom
     apr_sendfile -> apr_socket_sendfile
     apr_recv -> apr_socket_recv


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

6 files changed, 181 insertions, 39 deletions

diff --git a/user/netware/groupinfo.c b/user/netware/groupinfo.c
index 50b45bff6..46002c266 100644
--- a/user/netware/groupinfo.c
+++ b/user/netware/groupinfo.c
@@ -66,12 +66,14 @@
 #include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
 #endif
 
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
+                                           apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
   
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupname, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
+                                      const char *groupname, apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
@@ -80,5 +82,17 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupn
 APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
                                             apr_gid_t groupid, apr_pool_t *p)
 {
-    return apr_group_name_get(groupname, groupid, p);
+    return apr_gid_name_get(groupname, groupid, p);
+}
+
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
+                                             apr_gid_t groupid, apr_pool_t *p)
+{
+    return apr_gid_name_get(groupname, groupid, p);
+}
+
+APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
+                                          const char *groupname, apr_pool_t *p)
+{
+    return apr_gid_get(groupid, groupname, p);
 }
diff --git a/user/netware/userinfo.c b/user/netware/userinfo.c
index 2f88a225d..98ac409d7 100644
--- a/user/netware/userinfo.c
+++ b/user/netware/userinfo.c
@@ -75,18 +75,18 @@ static apr_status_t getpwnam_safe(const char *username,
     return APR_ENOTIMPL;
 }
 
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
-                                                 const char *username,
-                                                 apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
+                                               const char *username,
+                                               apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
 
 
 
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
+                                          apr_gid_t *gid,
+                                          apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
@@ -94,15 +94,43 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
 
 
 
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
+                                      const char *username, apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
 
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
+                                           apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
 
-  
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
+                                                 const char *username,
+                                                 apr_pool_t *p)
+{
+    return apr_uid_homepath_get(dirname, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
+                                         const char *username, apr_pool_t *p)
+{
+    return apr_uid_get(uid, gid, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
+                                             apr_gid_t *gid,
+                                             apr_pool_t *p)
+{
+    return apr_uid_current(uid, gid, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p)
+{
+    return apr_uid_name_get(username, uid, p);
+}
diff --git a/user/unix/groupinfo.c b/user/unix/groupinfo.c
index 8519b838f..e0ba9aa90 100644
--- a/user/unix/groupinfo.c
+++ b/user/unix/groupinfo.c
@@ -66,7 +66,8 @@
 #include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
 #endif
 
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
+                                           apr_pool_t *p)
 {
     struct group *gr;
 #ifndef BEOS
@@ -86,7 +87,8 @@ APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid
     return APR_SUCCESS;
 }
   
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupname, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
+                                      const char *groupname, apr_pool_t *p)
 {
     struct group *gr;
 #ifndef BEOS
@@ -110,5 +112,17 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupn
 APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
                                             apr_gid_t groupid, apr_pool_t *p)
 {
-    return apr_group_name_get(groupname, groupid, p);
+    return apr_gid_name_get(groupname, groupid, p);
+}
+
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
+                                             apr_gid_t groupid, apr_pool_t *p)
+{
+    return apr_gid_name_get(groupname, groupid, p);
+}
+
+APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
+                                          const char *groupname, apr_pool_t *p)
+{
+    return apr_gid_get(groupid, groupname, p);
 }
diff --git a/user/unix/userinfo.c b/user/unix/userinfo.c
index 1455c8f5e..a268f521b 100644
--- a/user/unix/userinfo.c
+++ b/user/unix/userinfo.c
@@ -94,9 +94,9 @@ static apr_status_t getpwnam_safe(const char *username,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
-                                                 const char *username,
-                                                 apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
+                                               const char *username,
+                                               apr_pool_t *p)
 {
     struct passwd pw;
     char pwbuf[PWBUF_SIZE];
@@ -116,9 +116,9 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
 
 
 
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
+                                          apr_gid_t *gid,
+                                          apr_pool_t *p)
 {
     *uid = getuid();
     *gid = getgid();
@@ -129,8 +129,8 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
 
 
 
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
+                                      const char *username, apr_pool_t *p)
 {
     struct passwd pw;
     char pwbuf[PWBUF_SIZE];
@@ -145,7 +145,8 @@ APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
+                                           apr_pool_t *p)
 {
     struct passwd *pw;
 #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWUID_R)
@@ -162,4 +163,33 @@ APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, ap
     return APR_SUCCESS;
 }
 
-  
+/* deprecated */  
+APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
+                                                 const char *username,
+                                                 apr_pool_t *p)
+{
+    return apr_uid_homepath_get(dirname, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
+                                         const char *username, apr_pool_t *p)
+{
+    return apr_uid_get(uid, gid, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
+                                             apr_gid_t *gid,
+                                             apr_pool_t *p)
+{
+    return apr_uid_current(uid, gid, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, 
+                                           apr_pool_t *p)
+{
+    return apr_uid_name_get(username, userid, p);
+}
+
diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c
index c0a2af4a3..457a9063f 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -60,8 +60,8 @@
 #include <sys/types.h>
 #endif
 
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *gid, 
-                                         const char *groupname, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid, 
+                                      const char *groupname, apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -104,7 +104,7 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *gid,
 #endif
 }
 
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     *groupname = apr_pstrdup(p, "Administrators");
@@ -124,7 +124,7 @@ APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t groupid
     return APR_SUCCESS;
 }
   
-APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right)
+APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right)
 {
     if (!left || !right)
         return APR_EINVAL;
@@ -141,5 +141,22 @@ APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right)
 APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
                                             apr_gid_t groupid, apr_pool_t *p)
 {
+    return apr_gid_name_get(groupname, groupid, p);
+}
+
+APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
+                                            apr_gid_t groupid, apr_pool_t *p)
+{
     return apr_group_name_get(groupname, groupid, p);
 }
+
+APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *gid, 
+                                         const char *groupname, apr_pool_t *p)
+{
+    return apr_gid_get(gid, groupname, p);
+}
+
+APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right)
+{
+    return apr_gid_compare(left, right);
+}
diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c
index 28ae3ddd2..eb8e5bead 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -102,7 +102,9 @@ void get_sid_string(char *buf, int blen, apr_uid_t id)
 /* Query the ProfileImagePath from the version-specific branch, where the
  * regkey uses the user's name on 9x, and user's sid string on NT.
  */
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, const char *username, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname, 
+                                               const char *username, 
+                                               apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     *dirname = apr_pstrdup(p, "/My Documents");
@@ -119,7 +121,7 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, const char *use
         apr_uid_t uid;
         apr_gid_t gid;
     
-        if ((rv = apr_get_userid(&uid, &gid, username, p)) != APR_SUCCESS)
+        if ((rv = apr_uid_get(&uid, &gid, username, p)) != APR_SUCCESS)
             return rv;
 
         strcpy(regkey, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\"
@@ -197,9 +199,9 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, const char *use
 #endif /* _WIN32_WCE */
 }
 
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
+                                          apr_gid_t *gid,
+                                          apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -234,8 +236,8 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
 #endif 
 }
 
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
+                                      const char *username, apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -281,7 +283,8 @@ APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
 #endif
 }
 
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
+                                           apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     *username = apr_pstrdup(p, "Administrator");
@@ -301,7 +304,7 @@ APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, ap
 #endif
 }
   
-APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right)
+APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right)
 {
     if (!left || !right)
         return APR_EINVAL;
@@ -313,3 +316,39 @@ APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right)
 #endif
     return APR_SUCCESS;
 }
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, 
+                                                 const char *username, 
+                                                 apr_pool_t *p)
+{
+    return apr_uid_homepath_get(dirname, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
+                                         const char *username, apr_pool_t *p)
+{
+    return apr_uid_get(uid, gid, username, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
+                                             apr_gid_t *gid,
+                                             apr_pool_t *p)
+{
+    return apr_uid_current(uid, gid, p);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right)
+{
+    return apr_uid_compare(left, right);
+}
+
+/* deprecated */
+APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
+                                           apr_pool_t *p)
+{
+    return apr_uid_name_get(username, userid, p);
+}