Hi, see the attached patch for fixes to some unused-variable warnings.
[[ Remove variables which are written but not used in any way. * subversion/libsvn_client/conflicts.c: Remove unused variables ]] -- Patrick Steinhardt, Entwickler elego Software Solutions GmbH, http://www.elego.de Gebäude 12 (BIG), Gustav-Meyer-Allee 25, 13355 Berlin, Germany Sitz der Gesellschaft: Berlin, USt-IdNr.: DE 163214194 Handelsregister: Amtsgericht Charlottenburg HRB 77719 Geschäftsführer: Olaf Wagner
Index: subversion/libsvn_client/conflicts.c =================================================================== --- subversion/libsvn_client/conflicts.c (revision 1764453) +++ subversion/libsvn_client/conflicts.c (working copy) @@ -1911,11 +1911,9 @@ svn_node_kind_t incoming_kind; svn_wc_conflict_action_t conflict_action; svn_wc_operation_t conflict_operation; - svn_node_kind_t conflict_node_kind; conflict_action = svn_client_conflict_get_incoming_change(conflict); conflict_operation = svn_client_conflict_get_operation(conflict); - conflict_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); /* Determine the node kind of the incoming change. */ incoming_kind = svn_node_unknown; @@ -4401,7 +4399,6 @@ apr_pool_t *scratch_pool) { const char *action; - svn_node_kind_t victim_node_kind; svn_wc_operation_t conflict_operation; const char *old_repos_relpath; svn_revnum_t old_rev; @@ -4424,7 +4421,6 @@ scratch_pool, scratch_pool)); conflict_operation = svn_client_conflict_get_operation(conflict); - victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); edits = conflict->tree_conflict_incoming_details; @@ -6798,9 +6794,7 @@ const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; const char *victim_repos_relpath; - const char *victim_url; svn_revnum_t victim_peg_rev; - svn_opt_revision_t victim_opt_rev; const char *moved_to_repos_relpath; svn_revnum_t moved_to_peg_rev; struct conflict_tree_incoming_delete_details *details; @@ -6850,10 +6844,6 @@ SVN_ERR(svn_wc__node_get_repos_info(&victim_peg_rev, &victim_repos_relpath, NULL, NULL, ctx->wc_ctx, local_abspath, scratch_pool, scratch_pool)); - victim_url = apr_pstrcat(scratch_pool, repos_root_url, "/", - victim_repos_relpath, SVN_VA_NULL); - victim_opt_rev.kind = svn_opt_revision_number; - victim_opt_rev.value.number = victim_peg_rev; /* Get repository location of the moved-here node (incoming move). */ possible_moved_to_abspaths = @@ -7738,13 +7728,11 @@ apr_array_header_t *options, apr_pool_t *scratch_pool) { - svn_wc_operation_t operation; svn_wc_conflict_action_t incoming_change; svn_wc_conflict_reason_t local_change; const char *incoming_new_repos_relpath; svn_revnum_t incoming_new_pegrev; - operation = svn_client_conflict_get_operation(conflict); incoming_change = svn_client_conflict_get_incoming_change(conflict); local_change = svn_client_conflict_get_local_change(conflict); SVN_ERR(svn_client_conflict_get_incoming_new_repos_location( @@ -7857,7 +7845,6 @@ { svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; const char *incoming_old_repos_relpath; svn_revnum_t incoming_old_pegrev; svn_node_kind_t incoming_old_kind; @@ -7871,7 +7858,6 @@ return SVN_NO_ERROR; incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( &incoming_old_repos_relpath, &incoming_old_pegrev, @@ -7977,7 +7963,6 @@ { svn_node_kind_t victim_node_kind; svn_wc_conflict_action_t incoming_change; - svn_wc_conflict_reason_t local_change; const char *incoming_old_repos_relpath; svn_revnum_t incoming_old_pegrev; svn_node_kind_t incoming_old_kind; @@ -7991,7 +7976,6 @@ return SVN_NO_ERROR; incoming_change = svn_client_conflict_get_incoming_change(conflict); - local_change = svn_client_conflict_get_local_change(conflict); victim_node_kind = svn_client_conflict_tree_get_victim_node_kind(conflict); SVN_ERR(svn_client_conflict_get_incoming_old_repos_location( &incoming_old_repos_relpath, &incoming_old_pegrev,
signature.asc
Description: PGP signature