httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Greg Ames <grega...@apache.org>
Subject Re: cvs commit: httpd-2.0/server core.c
Date Fri, 08 Nov 2002 17:29:00 GMT
trawick@apache.org wrote:
> trawick     2002/11/08 05:17:09
> 
>   Modified:    server   core.c
>   Log:
>   adjust some parents to make the expression a tiny bit clearer and to
>   make gcc happy
>   
>   > core.c: In function `core_output_filter':
>   > core.c:3884: warning: suggest parentheses around && within ||
>   
>   Revision  Changes    Path
>   1.219     +2 -2      httpd-2.0/server/core.c
>   
>   Index: core.c
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/server/core.c,v
>   retrieving revision 1.218
>   retrieving revision 1.219
>   diff -u -r1.218 -r1.219
>   --- core.c	6 Nov 2002 19:34:51 -0000	1.218
>   +++ core.c	8 Nov 2002 13:17:09 -0000	1.219
>   @@ -3878,8 +3878,8 @@
>             *      (IOW, this response is a bit more complex, but we save it
>             *       with the hope of concatenating with another response)
>             */
>   -        if (nbytes + flen < AP_MIN_BYTES_TO_WRITE
>   -            && (!fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
>   +        if ((nbytes + flen < AP_MIN_BYTES_TO_WRITE
>   +            && !fd && !more && !APR_BUCKET_IS_FLUSH(last_e))
>                    || (APR_BUCKET_IS_EOS(last_e)
>                        && c->keepalive == AP_CONN_KEEPALIVE)) {
>    

ooops...the nbytes subexpression is supposed to be common to both of the OR 
clauses, like it was before my commit.  I'll straighten it out after lunch.

hmmm, I wonder why I didn't see gcc warnings...will investigate.

Greg


Mime
View raw message