Author: philip
Date: Mon Jul 2 14:50:15 2012
New Revision: 1356268
URL: http://svn.apache.org/viewvc?rev=1356268&view=rev
Log:
Fix two compiler warnings.
* subversion/libsvn_wc/update_editor.c
(close_file): Remove shadowing variable.
* subversion/libsvn_wc/wc_db.c
(read_tree_conflict): Remove unused function.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1356268&r1=1356267&r2=1356268&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jul 2 14:50:15
2012
@@ -4504,7 +4504,6 @@ close_file(void *file_baton,
if (conflict_skel)
{
- svn_skel_t *work_item;
svn_boolean_t completed;
SVN_ERR(svn_wc__conflict_skel_is_complete(&completed,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1356268&r1=1356267&r2=1356268&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 2 14:50:15 2012
@@ -6160,54 +6160,6 @@ svn_wc__db_revert_list_done(svn_wc__db_t
return SVN_NO_ERROR;
}
-/* Get any tree conflict associated with LOCAL_RELPATH in WCROOT, and put it
- in *TREE_CONFLICT, allocated in RESULT_POOL.
-
- Use SCRATCH_POOL for any temporary allocations.
- */
-static svn_error_t *
-read_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict,
- svn_wc__db_wcroot_t *wcroot,
- const char *local_relpath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_sqlite__stmt_t *stmt;
- svn_boolean_t have_row;
- const char *conflict_data;
- const svn_skel_t *skel;
- svn_error_t *err;
-
- *tree_conflict = NULL;
-
- if (!local_relpath[0])
- return SVN_NO_ERROR;
-
- SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_SELECT_ACTUAL_TREE_CONFLICT));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
- SVN_ERR(svn_sqlite__step(&have_row, stmt));
-
- if (!have_row)
- return svn_error_trace(svn_sqlite__reset(stmt));
-
- conflict_data = svn_sqlite__column_text(stmt, 0, NULL);
- skel = svn_skel__parse(conflict_data, strlen(conflict_data), scratch_pool);
-
- {
- const char *local_abspath
- = svn_dirent_join(wcroot->abspath, local_relpath, scratch_pool);
- const char *dir_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
-
- err = svn_wc__deserialize_conflict(tree_conflict, skel,
- dir_abspath, result_pool,
- scratch_pool);
- }
-
- return svn_error_compose_create(err,
- svn_sqlite__reset(stmt));
-}
-
/* Baton for remove_node_txn */
struct remove_node_baton
{
