X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=5e26f502b8340130c55b31f0c2c1b4b5581b027a;hp=8ba1b40c5ff9052bcb186cb00b9ceb74ca8ce359;hb=4cd34abccf768adb1fb30d797689fe9f005ede05;hpb=c572a51fac46f778905533d0e0fc8cafc1008a65 diff --git a/filters.c b/filters.c index 8ba1b40c..5e26f502 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.107 2008/05/04 17:52:56 fabiankeil Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.110 2008/11/10 16:40:25 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -40,6 +40,17 @@ const char filters_rcs[] = "$Id: filters.c,v 1.107 2008/05/04 17:52:56 fabiankei * * Revisions : * $Log: filters.c,v $ + * Revision 1.110 2008/11/10 16:40:25 fabiankeil + * Fix a gcc44 warning. + * + * Revision 1.109 2008/11/08 15:48:41 fabiankeil + * Mention actual values when complaining about + * the chunk size exceeding the buffer size. + * + * Revision 1.108 2008/05/21 15:35:08 fabiankeil + * - Mark csp as immutable for block_acl(). + * - Remove an obsolete complaint about filter_popups(). + * * Revision 1.107 2008/05/04 17:52:56 fabiankeil * Adjust parse_http_url() call to new prototype. * @@ -830,7 +841,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca) aca->mask = 0; for (i=1; i <= masklength ; i++) { - aca->mask |= (1 << (32 - i)); + aca->mask |= (1U << (32 - i)); } /* now mask off the host portion of the ip address @@ -2174,7 +2185,7 @@ static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size) return JB_ERR_PARSE; } - while (chunksize > 0) + while (chunksize > 0U) { if (NULL == (from_p = strstr(from_p, "\r\n"))) { @@ -2184,7 +2195,9 @@ static jb_err remove_chunked_transfer_coding(char *buffer, size_t *size) if ((newsize += chunksize) >= *size) { - log_error(LOG_LEVEL_ERROR, "Chunksize exceeds buffer in \"chunked\" transfer coding"); + log_error(LOG_LEVEL_ERROR, + "Chunk size %d exceeds buffer size %d in \"chunked\" transfer coding", + chunksize, *size); return JB_ERR_PARSE; } from_p += 2;