subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1640144 - /subversion/trunk/subversion/libsvn_fs_x/cached_data.c
Date Mon, 17 Nov 2014 11:38:47 GMT
Author: philip
Date: Mon Nov 17 11:38:47 2014
New Revision: 1640144

URL: http://svn.apache.org/r1640144
Log:
* subversion/libsvn_fs_x/cached_data.c
  (create_rep_state_body): Reduce scope of variable and avoid using
   it unitialized in an assert, this fixes a clang compiler warning.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/cached_data.c

Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1640144&r1=1640143&r2=1640144&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Mon Nov 17 11:38:47 2014
@@ -684,7 +684,6 @@ create_rep_state_body(rep_state_t **rep_
     {
       /* we will need the on-disk location for non-txn reps */
       apr_off_t offset;
-      apr_uint32_t sub_item;
       svn_boolean_t in_container = TRUE;
 
       /* ensure file is open and navigate to the start of rep header */
@@ -693,7 +692,6 @@ create_rep_state_body(rep_state_t **rep_
           /* ... we can re-use the same, already open file object.
            * This implies that we don't read from a txn.
            */
-          SVN_ERR_ASSERT(sub_item == 0);
           rs->sfile = *shared_file;
           SVN_ERR(auto_open_shared_file(rs->sfile));
         }
@@ -708,6 +706,8 @@ create_rep_state_body(rep_state_t **rep_
 
       if (SVN_IS_VALID_REVNUM(revision))
         {
+          apr_uint32_t sub_item;
+
           SVN_ERR(svn_fs_x__item_offset(&offset, &sub_item, fs,
                                         rs->sfile->rfile, &rep->id,
                                         scratch_pool));



Mime
View raw message