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 2015/10/30 01:28:49 UTC
svn commit: r1711393 - in /subversion/trunk/subversion/libsvn_fs_x:
revprops.c transaction.c util.c util.h
Author: stefan2
Date: Fri Oct 30 00:28:49 2015
New Revision: 1711393
URL: http://svn.apache.org/viewvc?rev=1711393&view=rev
Log:
Code cleanup in FSX.
* subversion/libsvn_fs_x/util.h
(svn_fs_x__move_into_place2): Rename to ...
(svn_fs_x__move_into_place): ... this.
* subversion/libsvn_fs_x/util.c
(svn_fs_x__move_into_place2): Rename to ...
(svn_fs_x__move_into_place): ... this.
* subversion/libsvn_fs_x/revprops.c
(switch_to_new_revprop): Update caller.
* subversion/libsvn_fs_x/transaction.c
(bump_txn_key,
bump_ids): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_x/revprops.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/util.c
subversion/trunk/subversion/libsvn_fs_x/util.h
Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1711393&r1=1711392&r2=1711393&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Fri Oct 30 00:28:49 2015
@@ -952,8 +952,8 @@ switch_to_new_revprop(svn_fs_t *fs,
SVN_ERR(svn_fs_x__batch_fsync_run(batch, scratch_pool));
/* Make the revision visible to all processes and threads. */
- SVN_ERR(svn_fs_x__move_into_place2(tmp_path, final_path, perms_reference,
- batch, scratch_pool));
+ SVN_ERR(svn_fs_x__move_into_place(tmp_path, final_path, perms_reference,
+ batch, scratch_pool));
SVN_ERR(svn_fs_x__batch_fsync_run(batch, scratch_pool));
/* Indicate that the update (if relevant) has been completed. */
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1711393&r1=1711392&r2=1711393&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Oct 30 00:28:49 2015
@@ -1287,9 +1287,9 @@ bump_txn_key(svn_fs_t *fs,
/* Increment the key and add a trailing \n to the string so the
txn-current file has a newline in it. */
- SVN_ERR(svn_fs_x__move_into_place2(txn_next_path, txn_current_path,
- txn_current_path, batch,
- scratch_pool));
+ SVN_ERR(svn_fs_x__move_into_place(txn_next_path, txn_current_path,
+ txn_current_path, batch,
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -3689,9 +3689,9 @@ bump_ids(void *baton,
/* Make the revision visible to all processes and threads. */
current_filename = svn_fs_x__path_current(b->fs, scratch_pool);
- SVN_ERR(svn_fs_x__move_into_place2(svn_fs_x__path_next(b->fs, scratch_pool),
- current_filename, current_filename,
- b->batch, scratch_pool));
+ SVN_ERR(svn_fs_x__move_into_place(svn_fs_x__path_next(b->fs, scratch_pool),
+ current_filename, current_filename,
+ b->batch, scratch_pool));
/* Bump txn id. */
SVN_ERR(bump_txn_key(b->fs, b->batch, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.c?rev=1711393&r1=1711392&r2=1711393&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.c Fri Oct 30 00:28:49 2015
@@ -723,11 +723,11 @@ svn_fs_x__read_number_from_stream(apr_in
}
svn_error_t *
-svn_fs_x__move_into_place2(const char *old_filename,
- const char *new_filename,
- const char *perms_reference,
- svn_fs_x__batch_fsync_t *batch,
- apr_pool_t *scratch_pool)
+svn_fs_x__move_into_place(const char *old_filename,
+ const char *new_filename,
+ const char *perms_reference,
+ svn_fs_x__batch_fsync_t *batch,
+ apr_pool_t *scratch_pool)
{
/* Copying permissions is a no-op on WIN32. */
SVN_ERR(svn_io_copy_perms(perms_reference, old_filename, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.h?rev=1711393&r1=1711392&r2=1711393&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.h Fri Oct 30 00:28:49 2015
@@ -465,10 +465,10 @@ svn_fs_x__read_number_from_stream(apr_in
This function almost duplicates svn_io_file_move(), but it tries to
guarantee a flush. */
svn_error_t *
-svn_fs_x__move_into_place2(const char *old_filename,
- const char *new_filename,
- const char *perms_reference,
- svn_fs_x__batch_fsync_t *batch,
- apr_pool_t *scratch_pool);
+svn_fs_x__move_into_place(const char *old_filename,
+ const char *new_filename,
+ const char *perms_reference,
+ svn_fs_x__batch_fsync_t *batch,
+ apr_pool_t *scratch_pool);
#endif