Hi,
this is a patch to rename apr_get_groupname to apr_group_name_get
Patch for httpd2 is following, svn is not touched.
--
Thom May -> [EMAIL PROTECTED]
The memory management on PowerPC can be used to frighten small children.
-- Linus Torvalds
Index: renames_pending
===================================================================
RCS file: /home/cvspublic/apr/renames_pending,v
retrieving revision 1.8
diff -u -u -r1.8 renames_pending
--- renames_pending 15 Apr 2002 00:01:09 -0000 1.8
+++ renames_pending 15 Apr 2002 12:27:46 -0000
@@ -1,7 +1,5 @@
Symbol renames for APR
-apr_group_name_get from apr_get_groupname
-
apr_user_homedir_get from apr_get_home_directory
apr_user_id_get from apr_get_userid
apr_user_name_get from apr_get_username
Index: include/apr_user.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_user.h,v
retrieving revision 1.17
diff -u -u -r1.17 apr_user.h
--- include/apr_user.h 13 Mar 2002 20:39:15 -0000 1.17
+++ include/apr_user.h 15 Apr 2002 12:27:57 -0000
@@ -154,7 +154,7 @@
* @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_groupname(char **groupname, apr_gid_t
groupid, apr_pool_t *p);
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t
groupid, apr_pool_t *p);
/**
* Get the groupid for a specified group name
Index: test/testfile.c
===================================================================
RCS file: /home/cvspublic/apr/test/testfile.c,v
retrieving revision 1.47
diff -u -u -r1.47 testfile.c
--- test/testfile.c 14 Mar 2002 22:21:38 -0000 1.47
+++ test/testfile.c 15 Apr 2002 12:28:00 -0000
@@ -218,7 +218,7 @@
if (finfo.valid & APR_FINFO_GROUP) {
STD_TEST_NEQ(" Getting groupname",
- apr_get_groupname(&buf, finfo.group, pool))
+ apr_group_name_get(&buf, finfo.group, pool))
STD_TEST_NEQ(" Comparing group ID's",
apr_compare_groups(finfo.group, gid))
printf(" (gid's for %s match)\n", buf);
Index: test/testuser.c
===================================================================
RCS file: /home/cvspublic/apr/test/testuser.c,v
retrieving revision 1.5
diff -u -u -r1.5 testuser.c
--- test/testuser.c 13 Mar 2002 20:39:28 -0000 1.5
+++ test/testuser.c 15 Apr 2002 12:28:02 -0000
@@ -117,7 +117,7 @@
}
}
- rv = apr_get_groupname(&groupname, groupid, p);
+ rv = apr_group_name_get(&groupname, groupid, p);
if (rv != APR_SUCCESS)
groupname = "(none)";
Index: user/netware/groupinfo.c
===================================================================
RCS file: /home/cvspublic/apr/user/netware/groupinfo.c,v
retrieving revision 1.4
diff -u -u -r1.4 groupinfo.c
--- user/netware/groupinfo.c 13 Mar 2002 20:39:31 -0000 1.4
+++ user/netware/groupinfo.c 15 Apr 2002 12:28:07 -0000
@@ -66,7 +66,7 @@
#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
#endif
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, apr_gid_t
groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, apr_gid_t
groupid, apr_pool_t *p)
{
return APR_ENOTIMPL;
}
Index: user/unix/groupinfo.c
===================================================================
RCS file: /home/cvspublic/apr/user/unix/groupinfo.c,v
retrieving revision 1.9
diff -u -u -r1.9 groupinfo.c
--- user/unix/groupinfo.c 13 Mar 2002 20:39:31 -0000 1.9
+++ user/unix/groupinfo.c 15 Apr 2002 12:28:07 -0000
@@ -66,7 +66,9 @@
#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
#endif
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, apr_gid_t
groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname,
+ apr_gid_t groupid,
+ apr_pool_t *p)
{
struct group *gr;
#ifndef BEOS
Index: user/win32/groupinfo.c
===================================================================
RCS file: /home/cvspublic/apr/user/win32/groupinfo.c,v
retrieving revision 1.7
diff -u -u -r1.7 groupinfo.c
--- user/win32/groupinfo.c 13 Mar 2002 20:39:31 -0000 1.7
+++ user/win32/groupinfo.c 15 Apr 2002 12:28:07 -0000
@@ -100,7 +100,9 @@
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, apr_gid_t
groupid, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname,
+ apr_gid_t groupid,
+ apr_pool_t *p)
{
SID_NAME_USE type;
char name[MAX_PATH], domain[MAX_PATH];
