svn commit: r1091190 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[hw...@apache.org]

Author: hwright
Date: Mon Apr 11 20:09:11 2011
New Revision: 1091190

URL: http://svn.apache.org/viewvc?rev=1091190&view=rev
Log:
Remove the subscript number from an internal function (the original version is
long gone).

* subversion/libsvn_wc/wc_db.c
  (set_tc_txn2): Rename to set_tc_txn().
  (svn_wc__db_op_set_tree_conflict): Update caller.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1091190&r1=1091189&r2=1091190&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Apr 11 20:09:11 2011
@@ -3628,10 +3628,10 @@ svn_wc__db_op_mark_resolved(svn_wc__db_t
 
 /* */
 static svn_error_t *
-set_tc_txn2(void *baton,
-            svn_wc__db_wcroot_t *wcroot,
-            const char *local_relpath,
-            apr_pool_t *scratch_pool)
+set_tc_txn(void *baton,
+           svn_wc__db_wcroot_t *wcroot,
+           const char *local_relpath,
+           apr_pool_t *scratch_pool)
 {
   const svn_wc_conflict_description2_t *tree_conflict = baton;
   const char *parent_relpath;
@@ -3709,7 +3709,7 @@ svn_wc__db_op_set_tree_conflict(svn_wc__
                               db, local_abspath, scratch_pool, scratch_pool));
   VERIFY_USABLE_WCROOT(wcroot);
 
-  SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, set_tc_txn2,
+  SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, set_tc_txn,
                               (void *) tree_conflict, scratch_pool));
 
   /* There may be some entries, and the lock info is now out of date.  */