You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/06/29 18:20:03 UTC
svn commit: r1355458 - in /subversion/trunk/subversion/libsvn_wc:
conflicts.c conflicts.h
Author: rhuijben
Date: Fri Jun 29 16:20:01 2012
New Revision: 1355458
URL: http://svn.apache.org/viewvc?rev=1355458&view=rev
Log:
Apply some const-s to the conflict api.
* subversion/libsvn_wc/conflicts.c
(conflict__get_operation,
conflict__get_conflict,
svn_wc__conflict_read_info,
svn_wc__conflict_read_text_conflict,
svn_wc__conflict_read_prop_conflict): Make some arguments conts.
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_read_info,
svn_wc__conflict_read_text_conflict,
svn_wc__conflict_read_prop_conflict): Make some arguments conts.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1355458&r1=1355457&r2=1355458&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jun 29 16:20:01 2012
@@ -137,8 +137,8 @@ conflict__prepend_location(svn_skel_t *s
/* Get the operation part of CONFLICT_SKELL or NULL if no operation is set
at this time */
static svn_error_t *
-conflict__get_operation(svn_skel_t **why,
- svn_skel_t *conflict_skel)
+conflict__get_operation(const svn_skel_t **why,
+ const svn_skel_t *conflict_skel)
{
SVN_ERR_ASSERT(conflict_skel
&& conflict_skel->children
@@ -254,8 +254,8 @@ svn_wc__conflict_skel_set_op_merge(svn_s
/* Gets the conflict data of the specified type CONFLICT_TYPE from
CONFLICT_SKEL, or NULL if no such conflict is recorded */
static svn_error_t *
-conflict__get_conflict(svn_skel_t **conflict,
- svn_skel_t *conflict_skel,
+conflict__get_conflict(const svn_skel_t **conflict,
+ const svn_skel_t *conflict_skel,
const char *conflict_type)
{
svn_skel_t *c;
@@ -464,7 +464,7 @@ svn_wc__conflict_read_info(svn_wc_operat
const apr_array_header_t **locations,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -500,11 +500,11 @@ svn_wc__conflict_read_text_conflict(cons
const char **their_abspath,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_skel_t *text_conflict;
+ const svn_skel_t *text_conflict;
svn_skel_t *m;
SVN_ERR(conflict__get_conflict(&text_conflict, conflict_skel,
@@ -573,11 +573,11 @@ svn_wc__conflict_read_prop_conflict(cons
apr_hash_t **conflicted_prop_names,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_skel_t *prop_conflict;
+ const svn_skel_t *prop_conflict;
svn_skel_t *c;
SVN_ERR(conflict__get_conflict(&prop_conflict, conflict_skel,
@@ -1483,7 +1483,7 @@ resolve_text_conflicts(svn_skel_t **work
svn_error_t *
svn_wc__conflict_invoke_resolver(svn_wc__db_t *db,
const char *local_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
const apr_array_header_t *merge_options,
svn_wc_conflict_resolver_func2_t resolver_func,
void *resolver_baton,
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1355458&r1=1355457&r2=1355458&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Fri Jun 29 16:20:01 2012
@@ -233,7 +233,7 @@ svn_wc__conflict_read_info(svn_wc_operat
const apr_array_header_t **locations,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -253,7 +253,7 @@ svn_wc__conflict_read_text_conflict(cons
const char **their_abspath,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -274,7 +274,7 @@ svn_wc__conflict_read_prop_conflict(cons
apr_hash_t **conflicted_prop_names,
svn_wc__db_t *db,
const char *wri_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -307,7 +307,7 @@ svn_wc__conflict_create_markers(svn_skel
svn_error_t *
svn_wc__conflict_invoke_resolver(svn_wc__db_t *db,
const char *local_abspath,
- svn_skel_t *conflict_skel,
+ const svn_skel_t *conflict_skel,
const apr_array_header_t *merge_options,
svn_wc_conflict_resolver_func2_t resolver_func,
void *resolver_baton,