apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/threadproc/win32 signals.c
Date Wed, 03 Sep 2003 17:12:18 GMT
trawick     2003/09/03 10:12:18

  Modified:    .        CHANGES
               include  apr_allocator.h apr_pools.h apr_signal.h
               memory/unix apr_pools.c
               threadproc/netware signals.c
               threadproc/unix signals.c
               threadproc/win32 signals.c
  Log:
  axe these deprecated functions:
  
  apr_allocator_get_mutex
  apr_allocator_get_owner
  apr_allocator_set_max_free
  apr_allocator_set_mutex
  apr_allocator_set_owner
  apr_pool_get_abort
  apr_pool_get_parent
  apr_pool_set_abort
  apr_pool_sub_make
  apr_signal_get_description
  
  Revision  Changes    Path
  1.429     +10 -0     apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.428
  retrieving revision 1.429
  diff -u -r1.428 -r1.429
  --- CHANGES	3 Sep 2003 16:31:46 -0000	1.428
  +++ CHANGES	3 Sep 2003 17:12:17 -0000	1.429
  @@ -3,10 +3,19 @@
     *) The following deprecated interfaces have been removed:
   
        apr_accept                   -> apr_socket_accept
  +     apr_allocator_get_mutex      -> apr_allocator_mutex_get
  +     apr_allocator_get_owner      -> apr_allocator_owner_get
  +     apr_allocator_set_max_free   -> apr_allocator_max_free_set
  +     apr_allocator_set_mutex      -> apr_allocator_mutex_set
  +     apr_allocator_set_owner      -> apr_allocator_owner_set
        apr_bind                     -> apr_socket_bind
        apr_connect                  -> apr_socket_connect
        apr_getsocketopt             -> apr_socket_opt_get
        apr_listen                   -> apr_socket_listen
  +     apr_pool_get_abort           -> apr_pool_abort_get
  +     apr_pool_get_parent          -> apr_pool_parent_get
  +     apr_pool_set_abort           -> apr_pool_abort_set
  +     apr_pool_sub_make            -> apr_pool_create_ex
        apr_recv                     -> apr_socket_recv
        apr_recvfrom                 -> apr_socket_recvfrom
        apr_send                     -> apr_socket_send
  @@ -15,6 +24,7 @@
        apr_sendv                    -> apr_socket_sendv
        apr_setsocketopt             -> apr_socket_opt_set
        apr_shutdown                 -> apr_socket_shutdown
  +     apr_signal_get_description   -> apr_signal_description_get
        apr_socket_create_ex         -> apr_socket_create
        apr_socket_set_inherit       -> apr_socket_inherit_set
        apr_socket_unset_inherit     -> apr_socket_inherit_unset
  
  
  
  1.16      +0 -20     apr/include/apr_allocator.h
  
  Index: apr_allocator.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_allocator.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_allocator.h	7 Mar 2003 12:09:53 -0000	1.15
  +++ apr_allocator.h	3 Sep 2003 17:12:17 -0000	1.16
  @@ -144,20 +144,12 @@
   APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
                                             apr_pool_t *pool);
   
  -/** @deprecated @see apr_allocator_owner_set */
  -APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
  -                                          apr_pool_t *pool);
  -
   /**
    * Get the current owner of the allocator
    * @param allocator The allocator to get the owner from
    */
   APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator);
   
  -/** @deprecated @see apr_allocator_owner_get */
  -APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
  -                                  apr_allocator_t *allocator);
  -
   /**
    * Set the current threshold at which the allocator should start
    * giving blocks back to the system.
  @@ -167,10 +159,6 @@
   APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator,
                                                apr_size_t size);
   
  -/** @deprecated @see apr_allocator_max_free_set */
  -APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
  -                                             apr_size_t size);
  -
   #include "apr_thread_mutex.h"
   
   #if APR_HAS_THREADS
  @@ -182,19 +170,11 @@
   APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
                                             apr_thread_mutex_t *mutex);
   
  -/** @deprecated @see apr_allocator_mutex_set */
  -APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
  -                                          apr_thread_mutex_t *mutex);
  -
   /**
    * Get the mutex currently set for the allocator
    * @param allocator The allocator
    */
   APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
  -                                      apr_allocator_t *allocator);
  -
  -/** @deprecated @see apr_allocator_mutex_get */
  -APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
                                         apr_allocator_t *allocator);
   
   #endif /* APR_HAS_THREADS */
  
  
  
  1.104     +0 -21     apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_pools.h,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- apr_pools.h	11 Mar 2003 20:02:06 -0000	1.103
  +++ apr_pools.h	3 Sep 2003 17:12:17 -0000	1.104
  @@ -275,17 +275,6 @@
   #endif
   #endif
   
  -/** @deprecated @see apr_pool_create_ex */
  -#if APR_POOL_DEBUG
  -#define apr_pool_sub_make(newpool, parent, abort_fn) \
  -    (void)apr_pool_create_ex_debug(newpool, parent, abort_fn, \
  -                                   NULL, \
  -                                   APR_POOL__FILE_LINE__)
  -#else
  -#define apr_pool_sub_make(newpool, parent, abort_fn) \
  -    (void)apr_pool_create_ex(newpool, parent, abort_fn, NULL)
  -#endif
  -
   /**
    * Find the pools allocator
    * @param pool The pool to get the allocator from.
  @@ -425,10 +414,6 @@
   APR_DECLARE(void) apr_pool_abort_set(apr_abortfunc_t abortfunc,
                                        apr_pool_t *pool);
   
  -/** @deprecated @see apr_pool_abort_set */
  -APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abortfunc,
  -                                     apr_pool_t *pool);
  -
   /**
    * Get the abort function associated with the specified pool.
    * @param pool The pool for retrieving the abort function.
  @@ -436,18 +421,12 @@
    */
   APR_DECLARE(apr_abortfunc_t) apr_pool_abort_get(apr_pool_t *pool);
   
  -/** @deprecated @see apr_pool_abort_get */
  -APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool);
  -
   /**
    * Get the parent pool of the specified pool.
    * @param pool The pool for retrieving the parent pool.
    * @return The parent of the given pool.
    */
   APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool);
  -
  -/** @deprecated @see apr_pool_parent_get */
  -APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool);
   
   /**
    * Determine if pool a is an ancestor of pool b
  
  
  
  1.18      +0 -3      apr/include/apr_signal.h
  
  Index: apr_signal.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_signal.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- apr_signal.h	5 Mar 2003 21:22:26 -0000	1.17
  +++ apr_signal.h	3 Sep 2003 17:12:17 -0000	1.18
  @@ -117,9 +117,6 @@
    */
   APR_DECLARE(const char *) apr_signal_description_get(int signum);
   
  -/** @deprecated @see apr_signal_description_get */
  -APR_DECLARE(const char *) apr_signal_get_description(int signum);
  -
   /**
    * APR-private function for initializing the signal package
    * @internal
  
  
  
  1.198     +0 -57     apr/memory/unix/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apr/memory/unix/apr_pools.c,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- apr_pools.c	18 Jul 2003 23:10:04 -0000	1.197
  +++ apr_pools.c	3 Sep 2003 17:12:18 -0000	1.198
  @@ -2228,60 +2228,3 @@
   }
   
   #endif /* APR_POOL_DEBUG */
  -
  -/* Deprecated */
  -APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
  -                                             apr_size_t size)
  -{
  -    apr_allocator_max_free_set(allocator, size);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abort_fn,
  -                                     apr_pool_t *pool)
  -{
  -    apr_pool_abort_set(abort_fn, pool);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool)
  -{
  -    return apr_pool_abort_get(pool);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool)
  -{
  -    return apr_pool_parent_get(pool);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
  -                                          apr_pool_t *pool)
  -{
  -    apr_allocator_owner_set(allocator, pool);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
  -                                  apr_allocator_t *allocator)
  -{
  -    return apr_allocator_owner_get(allocator);
  -}
  -
  -#if APR_HAS_THREADS
  -/* Deprecated */
  -APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
  -                                      apr_allocator_t *allocator)
  -{
  -    return apr_allocator_mutex_get(allocator);
  -}
  -
  -/* Deprecated */
  -APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
  -                                          apr_thread_mutex_t *mutex)
  -{
  -    apr_allocator_mutex_set(allocator, mutex);
  -}
  -#endif /* APR_HAS_THREADS */
  -
  
  
  
  1.9       +0 -6      apr/threadproc/netware/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/signals.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- signals.c	6 Jan 2003 23:44:38 -0000	1.8
  +++ signals.c	3 Sep 2003 17:12:18 -0000	1.9
  @@ -108,9 +108,3 @@
   
       return rv;
   }
  -
  -/* Deprecated */
  -const char *apr_signal_get_description(int signum)
  -{
  -    return apr_signal_description_get(signum);
  -}
  
  
  
  1.56      +0 -6      apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- signals.c	14 Jul 2003 09:00:55 -0000	1.55
  +++ signals.c	3 Sep 2003 17:12:18 -0000	1.56
  @@ -463,9 +463,3 @@
   }
   
   #endif
  -
  -/* Deprecated */
  -const char *apr_signal_get_description(int signum)
  -{
  -    return apr_signal_description_get(signum);
  -}
  
  
  
  1.26      +0 -6      apr/threadproc/win32/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/signals.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- signals.c	27 Feb 2003 19:13:48 -0000	1.25
  +++ signals.c	3 Sep 2003 17:12:18 -0000	1.26
  @@ -92,9 +92,3 @@
   {
       return "unknown signal (not supported)";
   }
  -
  -/* Deprecated */
  -const char *apr_signal_get_description(int signum)
  -{
  -    return apr_signal_description_get(signum);
  -}
  
  
  

Mime
View raw message