You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/24 16:43:19 UTC

svn commit: r1389413 - /subversion/trunk/tools/server-side/fsfs-reorg.c

Author: stefan2
Date: Mon Sep 24 14:43:18 2012
New Revision: 1389413

URL: http://svn.apache.org/viewvc?rev=1389413&view=rev
Log:
* tools/server-side/fsfs-reorg.c
  (get_content): fix another issue with 32 bit file pointers

Modified:
    subversion/trunk/tools/server-side/fsfs-reorg.c

Modified: subversion/trunk/tools/server-side/fsfs-reorg.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/fsfs-reorg.c?rev=1389413&r1=1389412&r2=1389413&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/fsfs-reorg.c (original)
+++ subversion/trunk/tools/server-side/fsfs-reorg.c Mon Sep 24 14:43:18 2012
@@ -320,6 +320,7 @@ get_content(svn_string_t **data,
   apr_file_t *file;
   revision_info_t *revision_info;
   svn_stringbuf_t *temp;
+  apr_off_t temp_offset;
   
   svn_string_t *result = get_cached_content(fs->cache, revision);
   if (result)
@@ -340,8 +341,11 @@ get_content(svn_string_t **data,
                                      scratch_pool);
   temp->len = revision_info->original.end - revision_info->original.offset;
   SVN_ERR(open_rev_or_pack_file(&file, fs, revision, scratch_pool));
-  SVN_ERR(svn_io_file_seek(file, APR_SET, &revision_info->original.offset,
+
+  temp_offset = (apr_off_t)revision_info->original.offset;
+  SVN_ERR(svn_io_file_seek(file, APR_SET, &temp_offset,
                            scratch_pool));
+  revision_info->original.offset = temp_offset;
   SVN_ERR(svn_io_file_read(file, temp->data, &temp->len, scratch_pool));
 
   set_cached_content(fs->cache, revision,