Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 5769 invoked from network); 17 Oct 2007 05:11:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Oct 2007 05:11:47 -0000 Received: (qmail 81023 invoked by uid 500); 17 Oct 2007 05:11:35 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 80969 invoked by uid 500); 17 Oct 2007 05:11:35 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 80958 invoked by uid 99); 17 Oct 2007 05:11:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2007 22:11:35 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 05:11:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AD7201A9832; Tue, 16 Oct 2007 22:11:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r585381 - /apr/apr-util/trunk/memcache/apr_memcache.c Date: Wed, 17 Oct 2007 05:11:26 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071017051126.AD7201A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Tue Oct 16 22:11:25 2007 New Revision: 585381 URL: http://svn.apache.org/viewvc?rev=585381&view=rev Log: Multiple type consistency violations. Modified: apr/apr-util/trunk/memcache/apr_memcache.c Modified: apr/apr-util/trunk/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/memcache/apr_memcache.c?rev=585381&r1=585380&r2=585381&view=diff ============================================================================== --- apr/apr-util/trunk/memcache/apr_memcache.c (original) +++ apr/apr-util/trunk/memcache/apr_memcache.c Tue Oct 16 22:11:25 2007 @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "apr_memcache.h" #include "apr_poll.h" #include "apr_version.h" +#include "apr_memcache.h" #include #define BUFFER_SIZE 512 @@ -503,8 +503,8 @@ }; APU_DECLARE(apr_uint32_t) apr_memcache_hash_crc32(void *baton, - const char *data, - const apr_size_t data_len) + const char *data, + apr_size_t data_len) { apr_uint32_t i; apr_uint32_t crc; @@ -518,7 +518,7 @@ APU_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton, const char *data, - const apr_size_t data_len) + apr_size_t data_len) { /* The default Perl Client doesn't actually use just crc32 -- it shifts it again * like this.... @@ -528,7 +528,7 @@ APU_DECLARE(apr_uint32_t) apr_memcache_hash(apr_memcache_t *mc, const char *data, - const apr_size_t data_len) + apr_size_t data_len) { if (mc->hash_func) { return mc->hash_func(mc->hash_baton, data, data_len); @@ -1112,7 +1112,7 @@ apr_hash_t *values, apr_hash_t *server_queries) { - int j; + unsigned int j; apr_memcache_value_t* value; if (!up) { @@ -1158,7 +1158,7 @@ unsigned int veclen = 2 + 2 * apr_hash_count(values) - 1; /* get [...]\r\n */ unsigned int i, j; unsigned int queries_sent; - apr_int32_t queries_recvd; + unsigned int queries_recvd; apr_hash_t * server_queries = apr_hash_make(temp_pool); struct cache_server_query_t* server_query;