You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2003/03/14 00:53:20 UTC

cvs commit: apr-util/include apr_buckets.h

trawick     2003/03/13 15:53:20

  Modified:    .        CHANGES
               include  apr_buckets.h
  Log:
  Fix the APR_BUCKET_IS_foo() macros so they parenthesize their parameter.
  This fixes compile problems with some types of parameters.
  
  Submitted by: Jim Carlson <jc...@jnous.com>
  Reviewed by:  Jeff Trawick
  
  Revision  Changes    Path
  1.103     +4 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- CHANGES	22 Feb 2003 17:02:48 -0000	1.102
  +++ CHANGES	13 Mar 2003 23:53:19 -0000	1.103
  @@ -1,5 +1,9 @@
   Changes with APR-util 0.9.2
   
  +  *) Fix the APR_BUCKET_IS_foo() macros so they parenthesize their parameter.
  +     This fixes compile problems with some types of parameters.
  +     [Jim Carlson <jc...@jnous.com>]
  +
     *) Queue overwrite, we now return the item pushed, not a reference to it. 
        [Paul Marquis <PMarquis@pobox.com, Jacob Lewallen <jl...@cs.ucr.edu>]
   
  
  
  
  1.150     +11 -11    apr-util/include/apr_buckets.h
  
  Index: apr_buckets.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- apr_buckets.h	6 Jan 2003 20:08:45 -0000	1.149
  +++ apr_buckets.h	13 Mar 2003 23:53:19 -0000	1.150
  @@ -484,70 +484,70 @@
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_METADATA(e)    (e->type->is_metadata)
  +#define APR_BUCKET_IS_METADATA(e)    ((e)->type->is_metadata)
   
   /**
    * Determine if a bucket is a FLUSH bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_FLUSH(e)       (e->type == &apr_bucket_type_flush)
  +#define APR_BUCKET_IS_FLUSH(e)       ((e)->type == &apr_bucket_type_flush)
   /**
    * Determine if a bucket is an EOS bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_EOS(e)         (e->type == &apr_bucket_type_eos)
  +#define APR_BUCKET_IS_EOS(e)         ((e)->type == &apr_bucket_type_eos)
   /**
    * Determine if a bucket is a FILE bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_FILE(e)        (e->type == &apr_bucket_type_file)
  +#define APR_BUCKET_IS_FILE(e)        ((e)->type == &apr_bucket_type_file)
   /**
    * Determine if a bucket is a PIPE bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_PIPE(e)        (e->type == &apr_bucket_type_pipe)
  +#define APR_BUCKET_IS_PIPE(e)        ((e)->type == &apr_bucket_type_pipe)
   /**
    * Determine if a bucket is a SOCKET bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_SOCKET(e)      (e->type == &apr_bucket_type_socket)
  +#define APR_BUCKET_IS_SOCKET(e)      ((e)->type == &apr_bucket_type_socket)
   /**
    * Determine if a bucket is a HEAP bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_HEAP(e)        (e->type == &apr_bucket_type_heap)
  +#define APR_BUCKET_IS_HEAP(e)        ((e)->type == &apr_bucket_type_heap)
   /**
    * Determine if a bucket is a TRANSIENT bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_TRANSIENT(e)   (e->type == &apr_bucket_type_transient)
  +#define APR_BUCKET_IS_TRANSIENT(e)   ((e)->type == &apr_bucket_type_transient)
   /**
    * Determine if a bucket is a IMMORTAL bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_IMMORTAL(e)    (e->type == &apr_bucket_type_immortal)
  +#define APR_BUCKET_IS_IMMORTAL(e)    ((e)->type == &apr_bucket_type_immortal)
   #if APR_HAS_MMAP
   /**
    * Determine if a bucket is a MMAP bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_MMAP(e)        (e->type == &apr_bucket_type_mmap)
  +#define APR_BUCKET_IS_MMAP(e)        ((e)->type == &apr_bucket_type_mmap)
   #endif
   /**
    * Determine if a bucket is a POOL bucket
    * @param e The bucket to inspect
    * @return true or false
    */
  -#define APR_BUCKET_IS_POOL(e)        (e->type == &apr_bucket_type_pool)
  +#define APR_BUCKET_IS_POOL(e)        ((e)->type == &apr_bucket_type_pool)
   
   /*
    * General-purpose reference counting for the various bucket types.