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 2013/07/15 15:29:55 UTC

svn commit: r1503236 - /subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c

Author: stefan2
Date: Mon Jul 15 13:29:54 2013
New Revision: 1503236

URL: http://svn.apache.org/r1503236
Log:
On the fsfs-improvements branch:  Clean up fallout of the 
svn_fs_fs__path_rev_absolute API change.

* subversion/libsvn_fs_fs/fs_fs.c
  (open_pack_or_rev_file): Fix access to unitialized data.

Modified:
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c?rev=1503236&r1=1503235&r2=1503236&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c Mon Jul 15 13:29:54 2013
@@ -1548,7 +1548,7 @@ open_pack_or_rev_file(apr_file_t **file,
                       apr_pool_t *pool)
 {
   fs_fs_data_t *ffd = fs->fsap_data;
-  svn_error_t *err;
+  svn_error_t *err = NULL;
   const char *path;
   svn_boolean_t retry = FALSE;
 
@@ -1557,9 +1557,8 @@ open_pack_or_rev_file(apr_file_t **file,
       path = svn_fs_fs__path_rev_absolute(fs, rev, pool);
 
       /* open the revision file in buffered r/o mode */
-      if (! err)
-        err = svn_io_file_open(file, path,
-                              APR_READ | APR_BUFFERED, APR_OS_DEFAULT, pool);
+      err = svn_io_file_open(file, path,
+                             APR_READ | APR_BUFFERED, APR_OS_DEFAULT, pool);
 
       if (err && APR_STATUS_IS_ENOENT(err->apr_err))
         {