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.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63475 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 67 insertions, 10 deletions

diff --git a/include/apr_compat.h b/include/apr_compat.h
index a82cdc239..23a307ae0 100644
--- a/include/apr_compat.h
+++ b/include/apr_compat.h
@@ -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 */
diff --git a/include/apr_time.h b/include/apr_time.h
index 8b60133ea..a630abd9f 100644
--- a/include/apr_time.h
+++ b/include/apr_time.h
@@ -153,6 +153,11 @@ APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result,
                                           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 @@ APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result,
  * @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);
 
 /**
diff --git a/include/apr_user.h b/include/apr_user.h
index 3cc99e0db..cda0d7c0b 100644
--- a/include/apr_user.h
+++ b/include/apr_user.h
@@ -154,7 +154,13 @@ 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_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
diff --git a/time/unix/time.c b/time/unix/time.c
index 9415b98a4..65b82b0aa 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -363,3 +363,18 @@ APR_DECLARE(void) apr_unix_setup_time(void)
 }
 
 #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);
+}
diff --git a/time/win32/time.c b/time/win32/time.c
index d8b0c4cf3..d10935829 100644
--- a/time/win32/time.c
+++ b/time/win32/time.c
@@ -279,3 +279,18 @@ APR_DECLARE(void) apr_sleep(apr_interval_time_t t)
      */
     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);
+}
diff --git a/user/netware/groupinfo.c b/user/netware/groupinfo.c
index 530f25881..50b45bff6 100644
--- a/user/netware/groupinfo.c
+++ b/user/netware/groupinfo.c
@@ -75,3 +75,10 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupn
 {
     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);
+}
diff --git a/user/unix/groupinfo.c b/user/unix/groupinfo.c
index a393a911a..8519b838f 100644
--- a/user/unix/groupinfo.c
+++ b/user/unix/groupinfo.c
@@ -105,3 +105,10 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, const char *groupn
 #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);
+}
diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c
index 25c51af31..c0a2af4a3 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -136,3 +136,10 @@ APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right)
 #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);
+}