You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/15 09:12:56 UTC

svn commit: r1146987 - in /subversion/branches/fs-progress/subversion: include/svn_fs.h include/svn_repos.h libsvn_repos/dump.c

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)