Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 34594 invoked from network); 23 Oct 2007 10:00:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Oct 2007 10:00:24 -0000 Received: (qmail 69277 invoked by uid 500); 23 Oct 2007 10:00:11 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 69219 invoked by uid 500); 23 Oct 2007 10:00:11 -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 69208 invoked by uid 99); 23 Oct 2007 10:00:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2007 03:00:11 -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; Tue, 23 Oct 2007 10:00:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D5DE1A9832; Tue, 23 Oct 2007 02:59:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587439 - in /apr/apr-util/trunk: dbm/apr_dbm_sdbm.c dbm/sdbm/sdbm_pair.c include/apr_sdbm.h Date: Tue, 23 Oct 2007 09:59:33 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071023095933.9D5DE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Tue Oct 23 02:59:32 2007 New Revision: 587439 URL: http://svn.apache.org/viewvc?rev=587439&view=rev Log: size'edness issues in sdbm, which is limited to int's (and in one case, manipulates an array of short's) Modified: apr/apr-util/trunk/dbm/apr_dbm_sdbm.c apr/apr-util/trunk/dbm/sdbm/sdbm_pair.c apr/apr-util/trunk/include/apr_sdbm.h Modified: apr/apr-util/trunk/dbm/apr_dbm_sdbm.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbm/apr_dbm_sdbm.c?rev=587439&r1=587438&r2=587439&view=diff ============================================================================== --- apr/apr-util/trunk/dbm/apr_dbm_sdbm.c (original) +++ apr/apr-util/trunk/dbm/apr_dbm_sdbm.c Tue Oct 23 02:59:32 2007 @@ -107,7 +107,7 @@ apr_sdbm_datum_t kd, rd; kd.dptr = key.dptr; - kd.dsize = key.dsize; + kd.dsize = (int)key.dsize; rv = apr_sdbm_fetch(dbm->file, &rd, kd); @@ -126,10 +126,10 @@ apr_sdbm_datum_t kd, vd; kd.dptr = key.dptr; - kd.dsize = key.dsize; + kd.dsize = (int)key.dsize; vd.dptr = value.dptr; - vd.dsize = value.dsize; + vd.dsize = (int)value.dsize; rv = apr_sdbm_store(dbm->file, kd, vd, APR_SDBM_REPLACE); @@ -143,7 +143,7 @@ apr_sdbm_datum_t kd; kd.dptr = key.dptr; - kd.dsize = key.dsize; + kd.dsize = (int)key.dsize; rv = apr_sdbm_delete(dbm->file, kd); @@ -157,7 +157,7 @@ apr_sdbm_datum_t vd, kd; kd.dptr = key.dptr; - kd.dsize = key.dsize; + kd.dsize = (int)key.dsize; if (apr_sdbm_fetch(dbm->file, &vd, kd) != APR_SUCCESS) exists = 0; Modified: apr/apr-util/trunk/dbm/sdbm/sdbm_pair.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbm/sdbm/sdbm_pair.c?rev=587439&r1=587438&r2=587439&view=diff ============================================================================== --- apr/apr-util/trunk/dbm/sdbm/sdbm_pair.c (original) +++ apr/apr-util/trunk/dbm/sdbm/sdbm_pair.c Tue Oct 23 02:59:32 2007 @@ -183,7 +183,7 @@ register int m; register char *dst = pag + (i == 1 ? PBLKSIZ : ino[i - 1]); register char *src = pag + ino[i + 1]; - register int zoo = dst - src; + register short zoo = (short) (dst - src); debug(("free-up %d ", zoo)); /* Modified: apr/apr-util/trunk/include/apr_sdbm.h URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/include/apr_sdbm.h?rev=587439&r1=587438&r2=587439&view=diff ============================================================================== --- apr/apr-util/trunk/include/apr_sdbm.h (original) +++ apr/apr-util/trunk/include/apr_sdbm.h Tue Oct 23 02:59:32 2007 @@ -50,6 +50,7 @@ /** pointer to the data stored/retrieved */ char *dptr; /** size of data */ + /* apr_ssize_t for release 2.0??? */ int dsize; } apr_sdbm_datum_t;