Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2AD9D7F6E for ; Fri, 28 Oct 2011 15:42:06 +0000 (UTC) Received: (qmail 73165 invoked by uid 500); 28 Oct 2011 15:42:06 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 73136 invoked by uid 500); 28 Oct 2011 15:42:06 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 73129 invoked by uid 99); 28 Oct 2011 15:42:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 15:42:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 15:42:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 012BA23888FD for ; Fri, 28 Oct 2011 15:41:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190404 - /subversion/trunk/subversion/libsvn_fs_fs/key-gen.c Date: Fri, 28 Oct 2011 15:41:44 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111028154145.012BA23888FD@eris.apache.org> Author: philip Date: Fri Oct 28 15:41:44 2011 New Revision: 1190404 URL: http://svn.apache.org/viewvc?rev=1190404&view=rev Log: Fix key addition in FSFS repositories with formats less than SVN_FS_FS__MIN_NO_GLOBAL_IDS_FORMAT. * subversion/libsvn_fs_fs/key-gen.c (svn_fs_fs__add_keys): Use signed type. Modified: subversion/trunk/subversion/libsvn_fs_fs/key-gen.c Modified: subversion/trunk/subversion/libsvn_fs_fs/key-gen.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/key-gen.c?rev=1190404&r1=1190403&r2=1190404&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_fs/key-gen.c (original) +++ subversion/trunk/subversion/libsvn_fs_fs/key-gen.c Fri Oct 28 15:41:44 2011 @@ -41,8 +41,8 @@ void svn_fs_fs__add_keys(const char *key1, const char *key2, char *result) { - apr_size_t i1 = strlen(key1) - 1; - apr_size_t i2 = strlen(key2) - 1; + apr_ssize_t i1 = strlen(key1) - 1; + apr_ssize_t i2 = strlen(key2) - 1; int i3 = 0; int val; int carry = 0;