wrowe 2002/06/08 13:04:26
Modified: include apr_compat.h apr_time.h apr_user.h
user/netware groupinfo.c
user/unix groupinfo.c
user/win32 groupinfo.c
time/unix time.c
time/win32 time.c
Log:
Revert bogusness by providing proper stubs for functions that existed
since the first indirect APR release [APACHE_2_0_35]. Fortunately,
these appear to be the only bogusness detected between _35 and _36, and
_37 must follow suit with stubs for newly deprecated symbols.
Of course all stubs fall out with 1.0.0, which I picture Apache adopting
with stronger version controls in APACHE_2_1_x, but we will see what
concensus each project adopts between now and then.
Revision Changes Path
1.16 +0 -9 apr/include/apr_compat.h
Index: apr_compat.h
===================================================================
RCS file: /home/cvs/apr/include/apr_compat.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_compat.h 29 Apr 2002 14:41:14 -0000 1.15
+++ apr_compat.h 8 Jun 2002 20:04:26 -0000 1.16
@@ -11,15 +11,6 @@
* @{
*/
-/* changes between APACHE_2_0_35 and APACHE_2_0_36 */
-
-/** @deprecated @see apr_time_exp_tz */
-#define apr_explode_time apr_time_exp_tz
-/** @deprecated @see apr_time_exp_lt */
-#define apr_explode_localtime apr_time_exp_lt
-/** @deprecated @see apr_group_name_get */
-#define apr_get_groupname apr_group_name_get
-
/* redefine 1.3.x symbols to those that now live in libapr */
/** @see APR_INLINE */
1.50 +9 -0 apr/include/apr_time.h
Index: apr_time.h
===================================================================
RCS file: /home/cvs/apr/include/apr_time.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apr_time.h 15 Apr 2002 00:01:09 -0000 1.49
+++ apr_time.h 8 Jun 2002 20:04:26 -0000 1.50
@@ -153,6 +153,11 @@
apr_time_t input,
apr_int32_t offs);
+/** @deprecated @see apr_time_exp_tz */
+APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
+ apr_time_t input,
+ apr_int32_t offs);
+
/**
* convert a time to its human readable components in GMT timezone
* @param result the exploded time
@@ -167,6 +172,10 @@
* @param input the time to explode
*/
APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result,
+ apr_time_t input);
+
+/** @deprecated @see apr_time_exp_lt */
+APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result,
apr_time_t input);
/**
1.19 +7 -1 apr/include/apr_user.h
Index: apr_user.h
===================================================================
RCS file: /home/cvs/apr/include/apr_user.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apr_user.h 22 Apr 2002 10:24:41 -0000 1.18
+++ apr_user.h 8 Jun 2002 20:04:26 -0000 1.19
@@ -154,7 +154,13 @@
* @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_group_name_get(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);
+
+/** @deprecated @see apr_group_name_get */
+#define apr_get_groupname apr_group_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
1.6 +7 -0 apr/user/netware/groupinfo.c
Index: groupinfo.c
===================================================================
RCS file: /home/cvs/apr/user/netware/groupinfo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- groupinfo.c 22 Apr 2002 10:24:41 -0000 1.5
+++ groupinfo.c 8 Jun 2002 20:04:26 -0000 1.6
@@ -75,3 +75,10 @@
{
return APR_ENOTIMPL;
}
+
+/* Deprecated */
+APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
+ apr_gid_t groupid, apr_pool_t *p)
+{
+ return apr_group_name_get(groupname, groupid, p);
+}
1.11 +7 -0 apr/user/unix/groupinfo.c
Index: groupinfo.c
===================================================================
RCS file: /home/cvs/apr/user/unix/groupinfo.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- groupinfo.c 22 Apr 2002 10:24:41 -0000 1.10
+++ groupinfo.c 8 Jun 2002 20:04:26 -0000 1.11
@@ -105,3 +105,10 @@
#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_group_name_get(groupname, groupid, p);
+}
1.10 +7 -0 apr/user/win32/groupinfo.c
Index: groupinfo.c
===================================================================
RCS file: /home/cvs/apr/user/win32/groupinfo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- groupinfo.c 4 Jun 2002 04:57:22 -0000 1.9
+++ groupinfo.c 8 Jun 2002 20:04:26 -0000 1.10
@@ -136,3 +136,10 @@
#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_group_name_get(groupname, groupid, p);
+}
1.69 +15 -0 apr/time/unix/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apr/time/unix/time.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- time.c 15 Apr 2002 00:01:09 -0000 1.68
+++ time.c 8 Jun 2002 20:04:26 -0000 1.69
@@ -363,3 +363,18 @@
}
#endif
+
+/* Deprecated */
+APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
+ apr_time_t input,
+ apr_int32_t offs)
+{
+ return apr_time_exp_tz(result, input, offs);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result,
+ apr_time_t input)
+{
+ return apr_time_exp_lt(result, input);
+}
1.34 +15 -0 apr/time/win32/time.c
Index: time.c
===================================================================
RCS file: /home/cvs/apr/time/win32/time.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- time.c 22 May 2002 00:57:24 -0000 1.33
+++ time.c 8 Jun 2002 20:04:26 -0000 1.34
@@ -279,3 +279,18 @@
*/
Sleep((DWORD)(t / 1000));
}
+
+/* Deprecated */
+APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
+ apr_time_t input,
+ apr_int32_t offs)
+{
+ return apr_time_exp_tz(result, input, offs);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result,
+ apr_time_t input)
+{
+ return apr_time_exp_lt(result, input);
+}
|