remove these interfaces:

apr_compare_groups
apr_compare_users
apr_current_userid
apr_explode_localtime
apr_explode_time
apr_filename_of_pathname
apr_get_groupid
apr_get_groupname
apr_get_home_directory
apr_get_userid
apr_get_username
apr_group_name_get
apr_implode_gmt
apr_lstat
FNM_NOMATCH
FNM_NOESCAPE
FNM_PATHNAME
FNM_PERIOD
FNM_CASE_BLIND

change the function args to this interface:

apr_mmap_dup

this function's args changed in a previous commit, so
mention that in CHANGES

apr_socket_create


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

7 files changed, 1 insertions, 87 deletions

diff --git a/include/apr_file_info.h b/include/apr_file_info.h
index a8914fa07..e14fe0f6f 100644
--- a/include/apr_file_info.h
+++ b/include/apr_file_info.h
@@ -249,20 +249,6 @@ struct apr_finfo_t {
 APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname,
                                    apr_int32_t wanted, apr_pool_t *cont);
 
-/**
- * get the specified file's stats.  The file is specified by filename, 
- * instead of using a pre-opened file.  If the file is a symlink, this function
- * will get the stats for the symlink not the file the symlink refers to.
- * @param finfo Where to store the information about the file, which is
- * never touched if the call fails.
- * @param fname The name of the file to stat.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
- * @param cont the pool to use to allocate the new file. 
- * @deprecated This function is depreciated, it's equivilant to calling apr_stat with 
- * the wanted flag value APR_FINFO_LINK
- */ 
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                                    apr_int32_t wanted, apr_pool_t *cont);
 /** @} */
 /**
  * @defgroup apr_dir Directory Manipulation Functions
diff --git a/include/apr_fnmatch.h b/include/apr_fnmatch.h
index 8be40fc82..04a3597d3 100644
--- a/include/apr_fnmatch.h
+++ b/include/apr_fnmatch.h
@@ -63,12 +63,6 @@ extern "C" {
                                    * @remark This flag is an Apache addition 
                                    */
 
-#define FNM_NOMATCH    APR_FNM_NOMATCH    /**< @deprecated @see APR_FNM_NOMATCH */
-#define FNM_NOESCAPE   APR_FNM_NOESCAPE   /**< @deprecated @see APR_FNM_NOESCAPE */
-#define FNM_PATHNAME   APR_FNM_PATHNAME   /**< @deprecated @see APR_FNM_PATHNAME */
-#define FNM_PERIOD     APR_FNM_PERIOD     /**< @deprecated @see APR_FNM_PERIOD */
-#define FNM_CASE_BLIND APR_FNM_CASE_BLIND /**< @deprecated @see APR_FNM_CASE_BLIND */
-
 /**
  * Try to match the string to the given pattern, return APR_SUCCESS if
  *    match, else return APR_FNM_NOMATCH.
diff --git a/include/apr_general.h b/include/apr_general.h
index 088175725..72ed83cf2 100644
--- a/include/apr_general.h
+++ b/include/apr_general.h
@@ -147,12 +147,6 @@ typedef int               apr_signum_t;
 #define APR_OFFSETOF(s_type,field) APR_OFFSET(s_type*,field)
 #endif
 
-/** @deprecated @see APR_OFFSET */
-#define APR_XtOffset APR_OFFSET
-
-/** @deprecated @see APR_OFFSETOF */
-#define APR_XtOffsetOf APR_OFFSETOF
-
 #ifndef DOXYGEN
 
 /* A couple of prototypes for functions in case some platform doesn't 
diff --git a/include/apr_lib.h b/include/apr_lib.h
index 90fd6e564..feac95ca8 100644
--- a/include/apr_lib.h
+++ b/include/apr_lib.h
@@ -121,9 +121,6 @@ struct apr_vformatter_buff_t {
  */
 APR_DECLARE(const char *) apr_filepath_name_get(const char *pathname);
 
-/** @deprecated @see apr_filepath_name_get */
-APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname);
-
 /**
  * apr_killpg
  * Small utility macros to make things easier to read.  Not usually a
diff --git a/include/apr_mmap.h b/include/apr_mmap.h
index f6255d0ae..d6deccf31 100644
--- a/include/apr_mmap.h
+++ b/include/apr_mmap.h
@@ -118,9 +118,6 @@ struct apr_mmap_t {
     void *mm;
     /** The amount of data in the mmap */
     apr_size_t size;
-    /** @deprecated this field is no longer used and will be removed
-     * in APR 1.0 */
-    int unused;
     /** ring of apr_mmap_t's that reference the same
      * mmap'ed region; acts in place of a reference count */
     APR_RING_ENTRY(apr_mmap_t) link;
@@ -181,13 +178,10 @@ APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **newmmap,
  * @param new_mmap The structure to duplicate into. 
  * @param old_mmap The mmap to duplicate.
  * @param p The pool to use for new_mmap.
- * @param transfer_ownership DEPRECATED: this param is now ignored
- *  and should be removed prior to APR 1.0
  */         
 APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
                                        apr_mmap_t *old_mmap,
-                                       apr_pool_t *p,
-                                       int transfer_ownership);
+                                       apr_pool_t *p);
 
 #if defined(DOXYGEN)
 /**
@@ -195,7 +189,6 @@ APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
  * @param new_mmap The structure to duplicate into.
  * @param old_mmap The file to transfer.
  * @param p The pool to use for new_mmap.
- * @deprecated Just use apr_mmap_dup().  The transfer_ownership flag will
  *  go away soon anyway.
  */
 APR_DECLARE(apr_status_t) apr_mmap_setaside(apr_mmap_t **new_mmap,
diff --git a/include/apr_time.h b/include/apr_time.h
index 60ae2de86..44ff67597 100644
--- a/include/apr_time.h
+++ b/include/apr_time.h
@@ -174,11 +174,6 @@ 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
@@ -195,10 +190,6 @@ APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result,
 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);
-
 /**
  * Convert time value from human readable format to a numeric apr_time_t 
  * e.g. elapsed usec since epoch
@@ -217,10 +208,6 @@ APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *result,
 APR_DECLARE(apr_status_t) apr_time_exp_gmt_get(apr_time_t *result, 
                                                apr_time_exp_t *input);
 
-/** @deprecated @see apr_time_exp_gmt_get */
-APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *result, 
-                                          apr_time_exp_t *input);
-
 /**
  * Sleep for the specified number of micro-seconds.
  * @param t desired amount of time to sleep.
diff --git a/include/apr_user.h b/include/apr_user.h
index 4b70c5c24..d8027662d 100644
--- a/include/apr_user.h
+++ b/include/apr_user.h
@@ -105,10 +105,6 @@ 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)
@@ -119,9 +115,6 @@ APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *userid,
 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
@@ -133,10 +126,6 @@ APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
 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);
-
 /**
  * Get the home directory for the named user
  * @param dirname Pointer to new string containing directory name (on output)
@@ -148,11 +137,6 @@ 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.
  * @param left One uid to test
@@ -163,13 +147,8 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
  */
 #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
 
 /**
@@ -182,14 +161,6 @@ APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right);
 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_gid_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
  * @param groupid Pointer to the group id (on output)
@@ -200,10 +171,6 @@ APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname,
 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.
  * @param left One gid to test
@@ -214,12 +181,8 @@ APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid,
  */
 #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
 
 #endif  /* ! APR_HAS_USER */