Re: svn commit: r1631075 - in /subversion/trunk/subversion: libsvn_fs_fs/fs.h libsvn_fs_fs/fs_fs.c libsvn_fs_fs/structure libsvn_fs_fs/util.c tests/libsvn_fs/fs-test.c

[Branko Čibej]

On 11.10.2014 18:14, stef...@apache.org wrote:
> Author: stefan2
> Date: Sat Oct 11 16:14:28 2014
> New Revision: 1631075
>
> URL: http://svn.apache.org/r1631075
> Log:
> Make FSFS format 7 use a different name for the 'transactions' folder.

> --- subversion/trunk/subversion/libsvn_fs_fs/util.c (original)
> +++ subversion/trunk/subversion/libsvn_fs_fs/util.c Sat Oct 11 16:14:28 2014
> @@ -237,7 +237,11 @@ const char *
>  svn_fs_fs__path_txns_dir(svn_fs_t *fs,
>                           apr_pool_t *pool)
>  {
> -  return svn_dirent_join(fs->path, PATH_TXNS_DIR, pool);
> +  fs_fs_data_t *ffd = fs->fsap_data;
> +
> +  return ffd->format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT
> +       ? svn_dirent_join(fs->path, PATH_TXNS_LA_DIR, pool)
> +       : svn_dirent_join(fs->path, PATH_TXNS_DIR, pool);
>  }

Perhaps:

    const char *const txns_path = 
      (ffd->format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT
       ? PATH_TXNS_LA_DIR : PATH_TXNS_DIR);
    return svn_dirent_join(fs->path, txns_path, pool);

In any case, please put parentheses around conditional statements.


-- Brane