apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/user/win32 groupinfo.c userinfo.c
Date Wed, 03 Sep 2003 18:26:58 GMT
trawick     2003/09/03 11:26:58

  Modified:    .        CHANGES
               file_io/netware filestat.c
               file_io/os2 filestat.c
               file_io/unix dir.c filestat.c
               file_io/win32 filepath.c filestat.c
               include  apr_file_info.h apr_fnmatch.h apr_general.h
                        apr_lib.h apr_mmap.h apr_time.h apr_user.h
               mmap/unix mmap.c
               mmap/win32 mmap.c
               strings  apr_cpystrn.c
               time/unix time.c
               time/win32 time.c
               user/netware groupinfo.c userinfo.c
               user/unix groupinfo.c userinfo.c
               user/win32 groupinfo.c userinfo.c
  Log:
  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
  
  Revision  Changes    Path
  1.430     +24 -0     apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.429
  retrieving revision 1.430
  diff -u -r1.429 -r1.430
  --- CHANGES	3 Sep 2003 17:12:17 -0000	1.429
  +++ CHANGES	3 Sep 2003 18:26:57 -0000	1.430
  @@ -9,9 +9,23 @@
        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,7 +42,17 @@
        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
   
  
  
  
  1.32      +0 -9      apr/file_io/netware/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/filestat.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- filestat.c	14 Jul 2003 19:02:11 -0000	1.31
  +++ filestat.c	3 Sep 2003 18:26:57 -0000	1.32
  @@ -383,15 +383,6 @@
       }
   }
   
  -/* 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)
  
  
  
  1.38      +0 -8      apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filestat.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- filestat.c	8 Jul 2003 16:03:37 -0000	1.37
  +++ filestat.c	3 Sep 2003 18:26:57 -0000	1.38
  @@ -205,14 +205,6 @@
   
   
   
  -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,
  
  
  
  1.76      +1 -1      apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/dir.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- dir.c	7 Jan 2003 00:52:52 -0000	1.75
  +++ dir.c	3 Sep 2003 18:26:57 -0000	1.76
  @@ -244,7 +244,7 @@
           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;
       }
  
  
  
  1.69      +0 -7      apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filestat.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- filestat.c	8 Jul 2003 16:03:37 -0000	1.68
  +++ filestat.c	3 Sep 2003 18:26:57 -0000	1.69
  @@ -313,11 +313,4 @@
       }
   }
   
  -/* 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);
  -}
   
  
  
  
  1.43      +2 -2      apr/file_io/win32/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- filepath.c	25 Jun 2003 07:02:48 -0000	1.42
  +++ filepath.c	3 Sep 2003 18:26:57 -0000	1.43
  @@ -874,8 +874,8 @@
               }
               /* 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);
   
  
  
  
  1.82      +0 -6      apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- filestat.c	7 Jul 2003 22:44:10 -0000	1.81
  +++ filestat.c	3 Sep 2003 18:26:57 -0000	1.82
  @@ -686,12 +686,6 @@
       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,
  
  
  
  1.41      +0 -14     apr/include/apr_file_info.h
  
  Index: apr_file_info.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_info.h,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr_file_info.h	5 Mar 2003 21:22:25 -0000	1.40
  +++ apr_file_info.h	3 Sep 2003 18:26:57 -0000	1.41
  @@ -249,20 +249,6 @@
   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
  
  
  
  1.20      +0 -6      apr/include/apr_fnmatch.h
  
  Index: apr_fnmatch.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_fnmatch.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr_fnmatch.h	5 Mar 2003 21:22:26 -0000	1.19
  +++ apr_fnmatch.h	3 Sep 2003 18:26:57 -0000	1.20
  @@ -63,12 +63,6 @@
                                      * @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.
  
  
  
  1.81      +0 -6      apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_general.h,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- apr_general.h	5 Mar 2003 21:22:26 -0000	1.80
  +++ apr_general.h	3 Sep 2003 18:26:57 -0000	1.81
  @@ -147,12 +147,6 @@
   #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 
  
  
  
  1.64      +0 -3      apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_lib.h,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- apr_lib.h	17 Apr 2003 17:31:55 -0000	1.63
  +++ apr_lib.h	3 Sep 2003 18:26:57 -0000	1.64
  @@ -121,9 +121,6 @@
    */
   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
  
  
  
  1.37      +1 -8      apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_mmap.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- apr_mmap.h	5 Mar 2003 21:22:26 -0000	1.36
  +++ apr_mmap.h	3 Sep 2003 18:26:57 -0000	1.37
  @@ -118,9 +118,6 @@
       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 @@
    * @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 @@
    * @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,
  
  
  
  1.61      +0 -13     apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_time.h,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- apr_time.h	5 Mar 2003 21:22:26 -0000	1.60
  +++ apr_time.h	3 Sep 2003 18:26:57 -0000	1.61
  @@ -174,11 +174,6 @@
                                             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_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
  @@ -216,10 +207,6 @@
    */
   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.
  
  
  
  1.24      +0 -37     apr/include/apr_user.h
  
  Index: apr_user.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_user.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_user.h	5 Mar 2003 21:22:26 -0000	1.23
  +++ apr_user.h	3 Sep 2003 18:26:57 -0000	1.24
  @@ -105,10 +105,6 @@
                                             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_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_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 @@
                                                  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 @@
    */
   #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_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_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 @@
    */
   #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 */
  
  
  
  1.51      +1 -2      apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mmap.c	14 Jul 2003 00:38:17 -0000	1.50
  +++ mmap.c	3 Sep 2003 18:26:57 -0000	1.51
  @@ -182,8 +182,7 @@
   
   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;
  
  
  
  1.20      +1 -2      apr/mmap/win32/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apr/mmap/win32/mmap.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mmap.c	6 Mar 2003 12:21:17 -0000	1.19
  +++ mmap.c	3 Sep 2003 18:26:57 -0000	1.20
  @@ -180,8 +180,7 @@
   
   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;
  
  
  
  1.17      +0 -6      apr/strings/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apr/strings/apr_cpystrn.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_cpystrn.c	1 Jan 2003 00:01:55 -0000	1.16
  +++ apr_cpystrn.c	3 Sep 2003 18:26:58 -0000	1.17
  @@ -250,12 +250,6 @@
       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.
  
  
  
  1.74      +0 -20     apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apr/time/unix/time.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- time.c	6 Jan 2003 23:44:40 -0000	1.73
  +++ time.c	3 Sep 2003 18:26:58 -0000	1.74
  @@ -371,24 +371,4 @@
       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);
  -}
   
  
  
  
  1.47      +0 -24     apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apr/time/win32/time.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- time.c	23 Jan 2003 03:26:21 -0000	1.46
  +++ time.c	3 Sep 2003 18:26:58 -0000	1.47
  @@ -368,27 +368,3 @@
                                     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);
  -}
  -
  
  
  
  1.9       +0 -19     apr/user/netware/groupinfo.c
  
  Index: groupinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/netware/groupinfo.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- groupinfo.c	1 Jan 2003 00:02:00 -0000	1.8
  +++ groupinfo.c	3 Sep 2003 18:26:58 -0000	1.9
  @@ -77,22 +77,3 @@
   {
       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);
  -}
  
  
  
  1.7       +0 -28     apr/user/netware/userinfo.c
  
  Index: userinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/netware/userinfo.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- userinfo.c	1 Jan 2003 00:02:00 -0000	1.6
  +++ userinfo.c	3 Sep 2003 18:26:58 -0000	1.7
  @@ -106,31 +106,3 @@
       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);
  -}
  
  
  
  1.14      +0 -19     apr/user/unix/groupinfo.c
  
  Index: groupinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/unix/groupinfo.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- groupinfo.c	1 Jan 2003 00:02:01 -0000	1.13
  +++ groupinfo.c	3 Sep 2003 18:26:58 -0000	1.14
  @@ -107,22 +107,3 @@
   #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);
  -}
  
  
  
  1.22      +0 -31     apr/user/unix/userinfo.c
  
  Index: userinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/unix/userinfo.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- userinfo.c	1 Jan 2003 00:02:01 -0000	1.21
  +++ userinfo.c	3 Sep 2003 18:26:58 -0000	1.22
  @@ -162,34 +162,3 @@
       *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);
  -}
  -
  
  
  
  1.14      +0 -24     apr/user/win32/groupinfo.c
  
  Index: groupinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/win32/groupinfo.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- groupinfo.c	1 Jan 2003 00:02:01 -0000	1.13
  +++ groupinfo.c	3 Sep 2003 18:26:58 -0000	1.14
  @@ -136,27 +136,3 @@
   #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);
  -}
  
  
  
  1.24      +0 -35     apr/user/win32/userinfo.c
  
  Index: userinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/win32/userinfo.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- userinfo.c	7 Jan 2003 00:52:57 -0000	1.23
  +++ userinfo.c	3 Sep 2003 18:26:58 -0000	1.24
  @@ -317,38 +317,3 @@
       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);
  -}
  
  
  

Mime
View raw message