diff options
| -rw-r--r-- | CHANGES | 24 | ||||
| -rw-r--r-- | file_io/netware/filestat.c | 9 | ||||
| -rw-r--r-- | file_io/os2/filestat.c | 8 | ||||
| -rw-r--r-- | file_io/unix/dir.c | 2 | ||||
| -rw-r--r-- | file_io/unix/filestat.c | 7 | ||||
| -rw-r--r-- | file_io/win32/filepath.c | 4 | ||||
| -rw-r--r-- | file_io/win32/filestat.c | 6 | ||||
| -rw-r--r-- | include/apr_file_info.h | 14 | ||||
| -rw-r--r-- | include/apr_fnmatch.h | 6 | ||||
| -rw-r--r-- | include/apr_general.h | 6 | ||||
| -rw-r--r-- | include/apr_lib.h | 3 | ||||
| -rw-r--r-- | include/apr_mmap.h | 9 | ||||
| -rw-r--r-- | include/apr_time.h | 13 | ||||
| -rw-r--r-- | include/apr_user.h | 37 | ||||
| -rw-r--r-- | mmap/unix/mmap.c | 3 | ||||
| -rw-r--r-- | mmap/win32/mmap.c | 3 | ||||
| -rw-r--r-- | strings/apr_cpystrn.c | 6 | ||||
| -rw-r--r-- | time/unix/time.c | 20 | ||||
| -rw-r--r-- | time/win32/time.c | 24 | ||||
| -rw-r--r-- | user/netware/groupinfo.c | 19 | ||||
| -rw-r--r-- | user/netware/userinfo.c | 28 | ||||
| -rw-r--r-- | user/unix/groupinfo.c | 19 | ||||
| -rw-r--r-- | user/unix/userinfo.c | 31 | ||||
| -rw-r--r-- | user/win32/groupinfo.c | 24 | ||||
| -rw-r--r-- | user/win32/userinfo.c | 35 |
25 files changed, 30 insertions, 330 deletions
@@ -9,9 +9,23 @@ Changes with APR 1.0 apr_allocator_set_mutex -> apr_allocator_mutex_set apr_allocator_set_owner -> apr_allocator_owner_set apr_bind -> apr_socket_bind + apr_compare_groups -> apr_gid_compare + apr_compare_users -> apr_uid_compare apr_connect -> apr_socket_connect + apr_current_userid -> apr_uid_current + apr_explode_localtime -> apr_time_exp_lt + apr_explode_time -> apr_time_exp_tz + apr_filename_of_pathname -> apr_filepath_name_get apr_getsocketopt -> apr_socket_opt_get + apr_get_groupid -> apr_gid_get + apr_get_groupname -> apr_gid_name_get + apr_get_home_directory -> apr_uid_homepath_get + apr_get_userid -> apr_uid_get + apr_get_username -> apr_uid_name_get + apr_group_name_get -> apr_gid_name_get + apr_implode_gmt -> apr_time_exp_gmt_get apr_listen -> apr_socket_listen + apr_lstat -> apr_stat apr_pool_get_abort -> apr_pool_abort_get apr_pool_get_parent -> apr_pool_parent_get apr_pool_set_abort -> apr_pool_abort_set @@ -28,8 +42,18 @@ Changes with APR 1.0 apr_socket_create_ex -> apr_socket_create apr_socket_set_inherit -> apr_socket_inherit_set apr_socket_unset_inherit -> apr_socket_inherit_unset + FNM_NOMATCH -> APR_FNM_NOMATCH + FNM_NOESCAPE -> APR_FNM_NOESCAPE + FNM_PATHNAME -> APR_FNM_PATHNAME + FNM_PERIOD -> APR_FNM_PERIOD + FNM_CASE_BLIND -> APR_FNM_CASE_BLIND MAX_SECONDS_TO_LINGER -> APR_MAX_SECONDS_TO_LINGER + The following interfaces have function argument changes: + + apr_mmap_dup + apr_socket_create + Changes with APR 0.9.4 *) Work around a bug in Darwin when calling getnameinfo() on IPv4-mapped diff --git a/file_io/netware/filestat.c b/file_io/netware/filestat.c index d02c77a84..4b7d3f14d 100644 --- a/file_io/netware/filestat.c +++ b/file_io/netware/filestat.c @@ -383,15 +383,6 @@ APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, } } -/* Perhaps this becomes nothing but a macro? - */ -APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname, - apr_int32_t wanted, apr_pool_t *pool) -{ - return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool); -} - - APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname, apr_time_t mtime, apr_pool_t *pool) diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c index f1c77ce36..5da100f83 100644 --- a/file_io/os2/filestat.c +++ b/file_io/os2/filestat.c @@ -205,14 +205,6 @@ APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname, -APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname, - apr_int32_t wanted, apr_pool_t *cont) -{ - return apr_stat(finfo, fname, wanted, cont); -} - - - APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname, apr_fileattrs_t attributes, apr_fileattrs_t attr_mask, diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c index d8eafee55..491197488 100644 --- a/file_io/unix/dir.c +++ b/file_io/unix/dir.c @@ -244,7 +244,7 @@ apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted, if ((fspec[off - 1] != '/') && (off + 1 < sizeof(fspec))) fspec[off++] = '/'; apr_cpystrn(fspec + off, thedir->entry->d_name, sizeof(fspec) - off); - ret = apr_lstat(finfo, fspec, wanted, thedir->pool); + ret = apr_stat(finfo, fspec, APR_FINFO_LINK | wanted, thedir->pool); /* We passed a stack name that will disappear */ finfo->fname = NULL; } diff --git a/file_io/unix/filestat.c b/file_io/unix/filestat.c index 54784ddaa..4b41e9b32 100644 --- a/file_io/unix/filestat.c +++ b/file_io/unix/filestat.c @@ -313,11 +313,4 @@ APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, } } -/* Perhaps this becomes nothing but a macro? - */ -APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname, - apr_int32_t wanted, apr_pool_t *pool) -{ - return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool); -} diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c index e72504ece..f0bc5740a 100644 --- a/file_io/win32/filepath.c +++ b/file_io/win32/filepath.c @@ -874,8 +874,8 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, } /* Null term for stat! */ path[keptlen + seglen] = '\0'; - if ((rv = apr_lstat(&finfo, path, - APR_FINFO_TYPE | APR_FINFO_NAME, p)) + if ((rv = apr_stat(&finfo, path, + APR_FINFO_LINK | APR_FINFO_TYPE | APR_FINFO_NAME, p)) == APR_SUCCESS) { apr_size_t namelen = strlen(finfo.name); diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c index 56217c70d..812ff24c1 100644 --- a/file_io/win32/filestat.c +++ b/file_io/win32/filestat.c @@ -686,12 +686,6 @@ APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname, - apr_int32_t wanted, apr_pool_t *pool) -{ - return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool); -} - APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname, apr_fileattrs_t attributes, apr_fileattrs_t attr_mask, 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 */ diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 28f0f8b3b..249b8c26b 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -182,8 +182,7 @@ APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, 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) { *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t)); (*new_mmap)->cntxt = p; diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c index b8380d5cb..1e34ba259 100644 --- a/mmap/win32/mmap.c +++ b/mmap/win32/mmap.c @@ -180,8 +180,7 @@ APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, apr_file_t *file, 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) { *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t)); (*new_mmap)->cntxt = p; diff --git a/strings/apr_cpystrn.c b/strings/apr_cpystrn.c index 90acf3666..dc82b2807 100644 --- a/strings/apr_cpystrn.c +++ b/strings/apr_cpystrn.c @@ -250,12 +250,6 @@ APR_DECLARE(const char *) apr_filepath_name_get(const char *pathname) return s ? ++s : pathname; } -/* deprecated */ -APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname) -{ - return apr_filepath_name_get(pathname); -} - /* length of dest assumed >= length of src * collapse in place (src == dest) is legal. * returns terminating null ptr to dest string. diff --git a/time/unix/time.c b/time/unix/time.c index 949b9ff2d..d2e55f0a7 100644 --- a/time/unix/time.c +++ b/time/unix/time.c @@ -371,24 +371,4 @@ APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p) return; } -/* 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); -} - -/* Deprecated */ -APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *t, apr_time_exp_t *xt) -{ - return apr_time_exp_gmt_get(t, xt); -} diff --git a/time/win32/time.c b/time/win32/time.c index b5beb4c71..365282878 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -368,27 +368,3 @@ APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p) apr_pool_cleanup_null); } } - - -/* 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); -} - -/* Deprecated */ -APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *t, - apr_time_exp_t *xt) -{ - return apr_time_exp_gmt_get(t, xt); -} - diff --git a/user/netware/groupinfo.c b/user/netware/groupinfo.c index aac076ed5..d2e451402 100644 --- a/user/netware/groupinfo.c +++ b/user/netware/groupinfo.c @@ -77,22 +77,3 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, { return APR_ENOTIMPL; } - -/* Deprecated */ -APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, - apr_gid_t groupid, apr_pool_t *p) -{ - return apr_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, - apr_gid_t groupid, apr_pool_t *p) -{ - return apr_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, - const char *groupname, apr_pool_t *p) -{ - return apr_gid_get(groupid, groupname, p); -} diff --git a/user/netware/userinfo.c b/user/netware/userinfo.c index 63654f3ac..fd0c65a03 100644 --- a/user/netware/userinfo.c +++ b/user/netware/userinfo.c @@ -106,31 +106,3 @@ APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid, return APR_ENOTIMPL; } -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, - const char *username, - apr_pool_t *p) -{ - return apr_uid_homepath_get(dirname, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid, - const char *username, apr_pool_t *p) -{ - return apr_uid_get(uid, gid, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid, - apr_gid_t *gid, - apr_pool_t *p) -{ - return apr_uid_current(uid, gid, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p) -{ - return apr_uid_name_get(username, userid, p); -} diff --git a/user/unix/groupinfo.c b/user/unix/groupinfo.c index 852cc18e2..247cd6491 100644 --- a/user/unix/groupinfo.c +++ b/user/unix/groupinfo.c @@ -107,22 +107,3 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, #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_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, - apr_gid_t groupid, apr_pool_t *p) -{ - return apr_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, - const char *groupname, apr_pool_t *p) -{ - return apr_gid_get(groupid, groupname, p); -} diff --git a/user/unix/userinfo.c b/user/unix/userinfo.c index 1443fb27d..7b0c3440f 100644 --- a/user/unix/userinfo.c +++ b/user/unix/userinfo.c @@ -162,34 +162,3 @@ APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid, *username = apr_pstrdup(p, pw->pw_name); return APR_SUCCESS; } - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, - const char *username, - apr_pool_t *p) -{ - return apr_uid_homepath_get(dirname, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid, - const char *username, apr_pool_t *p) -{ - return apr_uid_get(uid, gid, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid, - apr_gid_t *gid, - apr_pool_t *p) -{ - return apr_uid_current(uid, gid, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, - apr_pool_t *p) -{ - return apr_uid_name_get(username, userid, p); -} - diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c index dcddceacc..bfd38b63e 100644 --- a/user/win32/groupinfo.c +++ b/user/win32/groupinfo.c @@ -136,27 +136,3 @@ APR_DECLARE(apr_status_t) apr_gid_compare(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_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, - apr_gid_t groupid, apr_pool_t *p) -{ - return apr_gid_name_get(groupname, groupid, p); -} - -APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *gid, - const char *groupname, apr_pool_t *p) -{ - return apr_gid_get(gid, groupname, p); -} - -APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right) -{ - return apr_gid_compare(left, right); -} diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c index 84df21322..e6977b863 100644 --- a/user/win32/userinfo.c +++ b/user/win32/userinfo.c @@ -317,38 +317,3 @@ APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right) return APR_SUCCESS; } -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, - const char *username, - apr_pool_t *p) -{ - return apr_uid_homepath_get(dirname, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid, - const char *username, apr_pool_t *p) -{ - return apr_uid_get(uid, gid, username, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid, - apr_gid_t *gid, - apr_pool_t *p) -{ - return apr_uid_current(uid, gid, p); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right) -{ - return apr_uid_compare(left, right); -} - -/* deprecated */ -APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, - apr_pool_t *p) -{ - return apr_uid_name_get(username, userid, p); -} |