From cvs-return-20072-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Sun Sep 12 22:15:01 2004 Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 10407 invoked from network); 12 Sep 2004 22:15:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 12 Sep 2004 22:15:01 -0000 Received: (qmail 52982 invoked by uid 500); 12 Sep 2004 22:15:00 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 52841 invoked by uid 500); 12 Sep 2004 22:14:59 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 52828 invoked by uid 500); 12 Sep 2004 22:14:59 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 52823 invoked by uid 99); 12 Sep 2004 22:14:58 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 12 Sep 2004 15:14:58 -0700 Received: (qmail 10372 invoked by uid 1582); 12 Sep 2004 22:14:57 -0000 Date: 12 Sep 2004 22:14:57 -0000 Message-ID: <20040912221457.10371.qmail@minotaur.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/dav/fs lock.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/09/12 15:14:57 Modified: modules/dav/fs lock.c Log: * modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record handling on 64-bit platforms: use correct size of apr_datum_t.dsize field. Revision Changes Path 1.32 +2 -2 httpd-2.0/modules/dav/fs/lock.c Index: lock.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/dav/fs/lock.c,v retrieving revision 1.31 retrieving revision 1.32 diff -d -w -u -r1.31 -r1.32 --- lock.c 19 Mar 2004 02:32:25 -0000 1.31 +++ lock.c 12 Sep 2004 22:14:57 -0000 1.32 @@ -66,7 +66,7 @@ ** INDIRECT LOCK: [char (DAV_LOCK_INDIRECT), ** apr_uuid_t locktoken, ** time_t expires, -** int key_size, +** apr_size_t key_size, ** char[] key] ** The key is to the collection lock that resulted in this indirect lock */ @@ -157,7 +157,7 @@ /* Stored indirect lock info - lock token and apr_datum_t */ #define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \ + sizeof(time_t) \ - + sizeof(int) + (a)->key.dsize) + + sizeof((a)->key.dsize) + (a)->key.dsize) /* ** The lockdb structure.