remove these interfaces:

apr_compare_groups
apr_compare_users
apr_current_userid
apr_explode_localtime
apr_explode_time
apr_filename_of_pathname
apr_get_groupid
apr_get_groupname
apr_get_home_directory
apr_get_userid
apr_get_username
apr_group_name_get
apr_implode_gmt
apr_lstat
FNM_NOMATCH
FNM_NOESCAPE
FNM_PATHNAME
FNM_PERIOD
FNM_CASE_BLIND

change the function args to this interface:

apr_mmap_dup

this function's args changed in a previous commit, so
mention that in CHANGES

apr_socket_create


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

6 files changed, 0 insertions, 156 deletions

diff --git a/user/netware/groupinfo.c b/user/netware/groupinfo.c
index aac076ed5..d2e451402 100644
--- a/user/netware/groupinfo.c
+++ b/user/netware/groupinfo.c
@@ -77,22 +77,3 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid,
 {
     return APR_ENOTIMPL;
 }
-
-/* Deprecated */
-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_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 63654f3ac..fd0c65a03 100644
--- a/user/netware/userinfo.c
+++ b/user/netware/userinfo.c
@@ -106,31 +106,3 @@ APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
     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, userid, p);
-}
diff --git a/user/unix/groupinfo.c b/user/unix/groupinfo.c
index 852cc18e2..247cd6491 100644
--- a/user/unix/groupinfo.c
+++ b/user/unix/groupinfo.c
@@ -107,22 +107,3 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid,
 #endif
     return APR_SUCCESS;
 }
-
-/* Deprecated */
-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_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 1443fb27d..7b0c3440f 100644
--- a/user/unix/userinfo.c
+++ b/user/unix/userinfo.c
@@ -162,34 +162,3 @@ APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
     *username = apr_pstrdup(p, pw->pw_name);
     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 dcddceacc..bfd38b63e 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -136,27 +136,3 @@ APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right)
 #endif
     return APR_SUCCESS;
 }
-
-/* Deprecated */
-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_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 *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 84df21322..e6977b863 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -317,38 +317,3 @@ APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right)
     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);
-}