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/07/31 11:49:03 UTC
svn commit: r1693558 - /subversion/trunk/subversion/libsvn_client/resolved.c
Author: stsp
Date: Fri Jul 31 09:49:02 2015
New Revision: 1693558
URL: http://svn.apache.org/r1693558
Log:
Consistenly name local variables of type svn_client_conflict_option_id_t.
No functional change.
* subversion/libsvn_client/resolved.c
(resolve_text_conflict, resolve_prop_conflict,
resolve_tree_conflict): Rename 'id' variable to 'option_id' for consistency.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1693558&r1=1693557&r2=1693558&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Jul 31 09:49:02 2015
@@ -458,14 +458,14 @@ resolve_text_conflict(svn_client_conflic
svn_client_conflict_t *conflict,
apr_pool_t *scratch_pool)
{
- svn_client_conflict_option_id_t id;
+ svn_client_conflict_option_id_t option_id;
const char *local_abspath;
- id = svn_client_conflict_option_get_id(option);
+ option_id = svn_client_conflict_option_get_id(option);
local_abspath = svn_client_conflict_get_local_abspath(conflict);
- SVN_ERR(resolve_conflict(id, local_abspath, TRUE, NULL, FALSE,
+ SVN_ERR(resolve_conflict(option_id, local_abspath, TRUE, NULL, FALSE,
conflict->ctx, scratch_pool));
- conflict->resolution = id;
+ conflict->resolution = option_id;
return SVN_NO_ERROR;
}
@@ -475,14 +475,14 @@ resolve_prop_conflict(svn_client_conflic
svn_client_conflict_t *conflict,
apr_pool_t *scratch_pool)
{
- svn_client_conflict_option_id_t id;
+ svn_client_conflict_option_id_t option_id;
const char *local_abspath;
- id = svn_client_conflict_option_get_id(option);
+ option_id = svn_client_conflict_option_get_id(option);
local_abspath = svn_client_conflict_get_local_abspath(conflict);
- SVN_ERR(resolve_conflict(id, local_abspath, FALSE, "", FALSE,
+ SVN_ERR(resolve_conflict(option_id, local_abspath, FALSE, "", FALSE,
conflict->ctx, scratch_pool));
- conflict->resolution = id;
+ conflict->resolution = option_id;
return SVN_NO_ERROR;
}
@@ -492,14 +492,14 @@ resolve_tree_conflict(svn_client_conflic
svn_client_conflict_t *conflict,
apr_pool_t *scratch_pool)
{
- svn_client_conflict_option_id_t id;
+ svn_client_conflict_option_id_t option_id;
const char *local_abspath;
- id = svn_client_conflict_option_get_id(option);
+ option_id = svn_client_conflict_option_get_id(option);
local_abspath = svn_client_conflict_get_local_abspath(conflict);
- SVN_ERR(resolve_conflict(id, local_abspath, FALSE, NULL, TRUE,
+ SVN_ERR(resolve_conflict(option_id, local_abspath, FALSE, NULL, TRUE,
conflict->ctx, scratch_pool));
- conflict->resolution = id;
+ conflict->resolution = option_id;
return SVN_NO_ERROR;
}