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 503B96B4B for ; Fri, 15 Jul 2011 07:13:35 +0000 (UTC) Received: (qmail 65859 invoked by uid 500); 15 Jul 2011 07:13:34 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 65755 invoked by uid 500); 15 Jul 2011 07:13:24 -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 65731 invoked by uid 99); 15 Jul 2011 07:13:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2011 07:13:20 +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, 15 Jul 2011 07:13:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C5DF2388894 for ; Fri, 15 Jul 2011 07:12:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1146987 - in /subversion/branches/fs-progress/subversion: include/svn_fs.h include/svn_repos.h libsvn_repos/dump.c Date: Fri, 15 Jul 2011 07:12:56 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110715071256.9C5DF2388894@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: danielsh Date: Fri Jul 15 07:12:55 2011 New Revision: 1146987 URL: http://svn.apache.org/viewvc?rev=1146987&view=rev Log: On the fs-progress branch, use a different variable type for the PROGRESS and TOTAL variables. * subversion/include/svn_fs.h (svn_fs_progress_notify_func_t): s/apr_off_t/apr_int64_t/ * subversion/include/svn_repos.h (svn_repos_notify_t): s/apr_off_t/apr_int64_t/ * subversion/libsvn_repos/dump.c (progress_to_notify): s/apr_off_t/apr_int64_t/ Modified: subversion/branches/fs-progress/subversion/include/svn_fs.h subversion/branches/fs-progress/subversion/include/svn_repos.h subversion/branches/fs-progress/subversion/libsvn_repos/dump.c Modified: subversion/branches/fs-progress/subversion/include/svn_fs.h URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/include/svn_fs.h?rev=1146987&r1=1146986&r2=1146987&view=diff ============================================================================== --- subversion/branches/fs-progress/subversion/include/svn_fs.h (original) +++ subversion/branches/fs-progress/subversion/include/svn_fs.h Fri Jul 15 07:12:55 2011 @@ -257,8 +257,8 @@ svn_fs_upgrade(const char *path, * * @since New in 1.8. */ -typedef void (*svn_fs_progress_notify_func_t)(apr_off_t progress, - apr_off_t total, +typedef void (*svn_fs_progress_notify_func_t)(apr_int64_t progress, + apr_int64_t total, int stage, void *baton, apr_pool_t *scratch_pool); Modified: subversion/branches/fs-progress/subversion/include/svn_repos.h URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/include/svn_repos.h?rev=1146987&r1=1146986&r2=1146987&view=diff ============================================================================== --- subversion/branches/fs-progress/subversion/include/svn_repos.h (original) +++ subversion/branches/fs-progress/subversion/include/svn_repos.h Fri Jul 15 07:12:55 2011 @@ -329,8 +329,8 @@ typedef struct svn_repos_notify_t /** For #svn_repos_notify_verify_aux_progress; see svn_fs_progress_notify_func_t. */ - apr_off_t progress_progress; - apr_off_t progress_total; + apr_int64_t progress_progress; + apr_int64_t progress_total; int progress_stage; /* NOTE: Add new fields at the end to preserve binary compatibility. Modified: subversion/branches/fs-progress/subversion/libsvn_repos/dump.c URL: http://svn.apache.org/viewvc/subversion/branches/fs-progress/subversion/libsvn_repos/dump.c?rev=1146987&r1=1146986&r2=1146987&view=diff ============================================================================== --- subversion/branches/fs-progress/subversion/libsvn_repos/dump.c (original) +++ subversion/branches/fs-progress/subversion/libsvn_repos/dump.c Fri Jul 15 07:12:55 2011 @@ -1254,8 +1254,8 @@ struct progress_to_notify_baton /* Implements svn_fs_progress_notify_func_t. */ static void -progress_to_notify(apr_off_t progress, - apr_off_t total, +progress_to_notify(apr_int64_t progress, + apr_int64_t total, int stage, void *baton, apr_pool_t *scratch_pool)