Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 18498 invoked from network); 7 Jul 2004 19:38:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Jul 2004 19:38:31 -0000 Received: (qmail 69927 invoked by uid 500); 7 Jul 2004 19:38:38 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 69822 invoked by uid 500); 7 Jul 2004 19:38:37 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 69796 invoked by uid 500); 7 Jul 2004 19:38:36 -0000 Delivered-To: apmail-apr-util-cvs@apache.org X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 7 Jul 2004 19:38:29 -0000 Message-ID: <20040707193829.18464.qmail@minotaur.apache.org> From: jorton@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/misc apr_rmm.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/07/07 12:38:29 Modified: misc apr_rmm.c Log: * misc/apr_rmm.c (apr_rmm_overhead_get): Account for worst case alignment overhead too. Revision Changes Path 1.27 +4 -1 apr-util/misc/apr_rmm.c Index: apr_rmm.c =================================================================== RCS file: /home/cvs/apr-util/misc/apr_rmm.c,v retrieving revision 1.26 retrieving revision 1.27 diff -d -w -u -r1.26 -r1.27 --- apr_rmm.c 7 Jul 2004 17:15:18 -0000 1.26 +++ apr_rmm.c 7 Jul 2004 19:38:29 -0000 1.27 @@ -409,5 +409,8 @@ APU_DECLARE(apr_size_t) apr_rmm_overhead_get(int n) { - return RMM_HDR_BLOCK_SIZE + n * RMM_BLOCK_SIZE; + /* overhead per block is at most APR_ALIGN_DEFAULT(1) wasted bytes + * for alignment overhead, plus the size of the rmm_block_t + * structure. */ + return RMM_HDR_BLOCK_SIZE + n * (RMM_BLOCK_SIZE + APR_ALIGN_DEFAULT(1)); }