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 2010/11/11 21:31:24 UTC
svn commit: r1034103 - in /subversion/trunk/subversion/libsvn_fs_fs: fs_fs.c
fs_fs.h lock.c
Author: danielsh
Date: Thu Nov 11 20:31:23 2010
New Revision: 1034103
URL: http://svn.apache.org/viewvc?rev=1034103&view=rev
Log:
Pass just FS_PATH, not an FS object.
* subversion/libsvn_fs_fs/fs_fs.h
(svn_fs_fs__ensure_dir_exists):
Take an FS_PATH instead of an svn_fs_t * object.
* subversion/libsvn_fs_fs/fs_fs.c
(set_node_origins_for_file): Track API change.
* subversion/libsvn_fs_fs/lock.c
(write_digest_file): Track API change.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h
subversion/trunk/subversion/libsvn_fs_fs/lock.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1034103&r1=1034102&r2=1034103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Nov 11 20:31:23 2010
@@ -7044,7 +7044,7 @@ svn_fs_fs__set_uuid(svn_fs_t *fs,
permissions as FS->path.*/
svn_error_t *
svn_fs_fs__ensure_dir_exists(const char *path,
- svn_fs_t *fs,
+ const char *fs_path,
apr_pool_t *pool)
{
svn_error_t *err = svn_io_dir_make(path, APR_OS_DEFAULT, pool);
@@ -7057,7 +7057,7 @@ svn_fs_fs__ensure_dir_exists(const char
/* We successfully created a new directory. Dup the permissions
from FS->path. */
- return svn_io_copy_perms(path, fs->path, pool);
+ return svn_io_copy_perms(path, fs_path, pool);
}
/* Set *NODE_ORIGINS to a hash mapping 'const char *' node IDs to
@@ -7129,7 +7129,7 @@ set_node_origins_for_file(svn_fs_t *fs,
SVN_ERR(svn_fs_fs__ensure_dir_exists(svn_dirent_join(fs->path,
PATH_NODE_ORIGINS_DIR,
pool),
- fs, pool));
+ fs->path, pool));
/* Read the previously existing origins (if any), and merge our
update with it. */
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h?rev=1034103&r1=1034102&r2=1034103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h Thu Nov 11 20:31:23 2010
@@ -492,9 +492,9 @@ svn_error_t *svn_fs_fs__txn_prop(svn_str
const char *propname, apr_pool_t *pool);
/* If directory PATH does not exist, create it and give it the same
- permissions as FS->path.*/
+ permissions as FS_PATH.*/
svn_error_t *svn_fs_fs__ensure_dir_exists(const char *path,
- svn_fs_t *fs,
+ const char *fs_path,
apr_pool_t *pool);
/* Update the node origin index for FS, recording the mapping from
Modified: subversion/trunk/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/lock.c?rev=1034103&r1=1034102&r2=1034103&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/lock.c Thu Nov 11 20:31:23 2010
@@ -168,9 +168,9 @@ write_digest_file(apr_hash_t *children,
const char *rev_0_path;
SVN_ERR(svn_fs_fs__ensure_dir_exists(svn_dirent_join(fs->path, PATH_LOCKS_DIR,
- pool), fs, pool));
+ pool), fs->path, pool));
SVN_ERR(svn_fs_fs__ensure_dir_exists(svn_dirent_dirname(digest_path, pool),
- fs, pool));
+ fs->path, pool));
if (lock)
{