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

1 files changed, 11 insertions, 11 deletions

diff --git a/test/testuser.c b/test/testuser.c
index cfda620c0..a08719a9a 100644
--- a/test/testuser.c
+++ b/test/testuser.c
@@ -93,14 +93,14 @@ int main(int argc, char *argv[])
         fprintf(stderr,
                 "optional: %s username\n",
                 argv[0]);
-        if ((rv = apr_current_userid(&userid, &groupid, p)) != APR_SUCCESS) {
-            fprintf(stderr, "apr_current_userid failed: %s\n",
+        if ((rv = apr_uid_current(&userid, &groupid, p)) != APR_SUCCESS) {
+            fprintf(stderr, "apr_uid_current failed: %s\n",
                     apr_strerror(rv, msgbuf, sizeof(msgbuf)));
             exit(-1);
         }
-        apr_get_username(&username, userid, p);
+        apr_uid_name_get(&username, userid, p);
         if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_get_username(,,) failed: %s\n",
+            fprintf(stderr, "apr_uid_name_get(,,) failed: %s\n",
                     apr_strerror(rv, msgbuf, sizeof(msgbuf)));
             exit(-1);
         }
@@ -108,22 +108,22 @@ int main(int argc, char *argv[])
     else {
         username = argv[1];
 
-        rv = apr_get_userid(&userid, &groupid, username, p);
+        rv = apr_uid_get(&userid, &groupid, username, p);
         if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_get_userid(,,%s,) failed: %s\n",
+            fprintf(stderr, "apr_uid_get(,,%s,) failed: %s\n",
                     username,
                     apr_strerror(rv, msgbuf, sizeof(msgbuf)));
             exit(-1);
         }
     }
 
-    rv = apr_group_name_get(&groupname, groupid, p);
+    rv = apr_gid_name_get(&groupname, groupid, p);
     if (rv != APR_SUCCESS)
         groupname = "(none)";
 
-    rv = apr_get_groupid(&newgroupid, groupname, p);
+    rv = apr_gid_get(&newgroupid, groupname, p);
     if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_get_groupid(,%s,) failed: %s\n",
+        fprintf(stderr, "apr_gid_get(,%s,) failed: %s\n",
                 groupname,
                 apr_strerror(rv, msgbuf, sizeof msgbuf));
         exit(-1);
@@ -143,9 +143,9 @@ int main(int argc, char *argv[])
            username,
            (int)userid, (int)groupid);
 
-    rv = apr_get_home_directory(&homedir, username, p);
+    rv = apr_uid_homepath_get(&homedir, username, p);
     if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_get_home_directory(,%s,) failed: %s\n",
+        fprintf(stderr, "apr_uid_homepath_get(,%s,) failed: %s\n",
                 username,
                 apr_strerror(rv, msgbuf, sizeof(msgbuf)));
         exit(-1);