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

1 files changed, 0 insertions, 37 deletions

diff --git a/include/apr_user.h b/include/apr_user.h
index 4b70c5c24..d8027662d 100644
--- a/include/apr_user.h
+++ b/include/apr_user.h
@@ -105,10 +105,6 @@ APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *userid,
                                           apr_gid_t *groupid,
                                           apr_pool_t *p);
 
-/** @deprecated @see apr_uid_current */
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *userid,
-                                             apr_gid_t *groupid,
-                                             apr_pool_t *p);
 /**
  * Get the user name for a specified userid
  * @param username Pointer to new string containing user name (on output)
@@ -119,9 +115,6 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *userid,
 APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
                                            apr_pool_t *p);
 
-/** @deprecated @see apr_uid_name_get */
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
-                                           apr_pool_t *p);
 /**
  * Get the userid (and groupid) for the specified username
  * @param userid   Returns the user id
@@ -133,10 +126,6 @@ APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
 APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *userid, apr_gid_t *groupid,
                                       const char *username, apr_pool_t *p);
 
-/** @deprecated @see apr_uid_get */
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *userid, apr_gid_t *groupid,
-                                         const char *username, apr_pool_t *p);
-
 /**
  * Get the home directory for the named user
  * @param dirname Pointer to new string containing directory name (on output)
@@ -148,11 +137,6 @@ APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
                                                const char *username, 
                                                apr_pool_t *p);
 
-/** @deprecated @see apr_uid_homepath_get */
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, 
-                                                 const char *username, 
-                                                 apr_pool_t *p);
-
 /**
  * Compare two user identifiers for equality.
  * @param left One uid to test
@@ -163,13 +147,8 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
  */
 #if defined(WIN32)
 APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right);
-
-/** @deprecated @see apr_uid_compare */
-APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right);
 #else
 #define apr_uid_compare(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-/** @deprecated @see apr_uid_compare */
-#define apr_compare_users(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
 #endif
 
 /**
@@ -182,14 +161,6 @@ APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right);
 APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, 
                                              apr_gid_t groupid, apr_pool_t *p);
 
-/** @deprecated @see apr_gid_name_get */
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p);
-
-/** @deprecated @see apr_gid_name_get */
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
-                                            apr_gid_t groupid, apr_pool_t *p);
-
 /**
  * Get the groupid for a specified group name
  * @param groupid Pointer to the group id (on output)
@@ -200,10 +171,6 @@ APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
 APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
                                       const char *groupname, apr_pool_t *p);
 
-/** @deprecated @see apr_gid_get */
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
-                                          const char *groupname, apr_pool_t *p);
-
 /**
  * Compare two group identifiers for equality.
  * @param left One gid to test
@@ -214,12 +181,8 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid,
  */
 #if defined(WIN32)
 APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right);
-/** @deprecated @see apr_gid_compare */
-APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right);
 #else
 #define apr_gid_compare(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-/** @deprecated @see apr_gid_compare */
-#define apr_compare_groups(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
 #endif
 
 #endif  /* ! APR_HAS_USER */