*) 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

1 files changed, 42 insertions, 5 deletions

diff --git a/include/apr_user.h b/include/apr_user.h
index e54411043..d31505cab 100644
--- a/include/apr_user.h
+++ b/include/apr_user.h
@@ -100,10 +100,14 @@ typedef gid_t                     apr_gid_t;
  * @param p The pool from which to allocate working space
  * @remark This function is available only if APR_HAS_USER is defined.
  */
+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)
@@ -111,8 +115,12 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *userid,
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  */
-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);
 
+/** @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
@@ -121,6 +129,10 @@ APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, ap
  * @param p The pool from which to allocate working space
  * @remark This function is available only if APR_HAS_USER is defined.
  */
+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);
 
@@ -131,7 +143,14 @@ APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *userid, apr_gid_t *groupid,
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  */
-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);
+
+/** @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.
@@ -142,8 +161,13 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, const char *use
  * @remark This function is available only if APR_HAS_USER is defined.
  */
 #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
 
@@ -154,10 +178,14 @@ APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right);
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  */
+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_group_name_get */
+/** @deprecated @see apr_gid_name_get */
 APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
                                             apr_gid_t groupid, apr_pool_t *p);
 
@@ -168,7 +196,12 @@ APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
  * @param p The pool from which to allocate the string
  * @remark This function is available only if APR_HAS_USER is defined.
  */
-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);
+
+/** @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.
@@ -179,8 +212,12 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupn
  * @remark This function is available only if APR_HAS_USER is defined.
  */
 #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