subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1683305 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c
Date Wed, 03 Jun 2015 12:01:40 GMT
Author: stsp
Date: Wed Jun  3 12:01:39 2015
New Revision: 1683305

URL: http://svn.apache.org/r1683305
Log:
Follow-up r1683257: Fix constness inconsistencies.

* subversion/include/svn_client.h
  (svn_client_conflict_get_local_abspath,
   svn_client_conflict_get_operation,
   svn_client_conflict_get_incoming_change,
   svn_client_conflict_get_local_change): Declare conflict param as const.

* subversion/libsvn_client/resolved.c
  (svn_client_conflict_get_local_abspath,
   svn_client_conflict_get_operation,
   svn_client_conflict_get_incoming_change,
   svn_client_conflict_get_local_change): Likewise for implementation.

Found by: brane

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1683305&r1=1683304&r2=1683305&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Jun  3 12:01:39 2015
@@ -4368,7 +4368,8 @@ svn_client_revert(const apr_array_header
  * @since New in 1.10. 
  */
 const char *
-svn_client_conflict_get_local_abspath(svn_wc_conflict_description2_t *conflict);
+svn_client_conflict_get_local_abspath(
+  const svn_wc_conflict_description2_t *conflict);
 
 /**
  * Return the operation during which the conflict described by @a
@@ -4377,7 +4378,8 @@ svn_client_conflict_get_local_abspath(sv
  * @since New in 1.10. 
  */
 svn_wc_operation_t
-svn_client_conflict_get_operation(svn_wc_conflict_description2_t *conflict);
+svn_client_conflict_get_operation(
+  const svn_wc_conflict_description2_t *conflict);
 
 /**
  * Return the action an update, switch, or merge operation attempted to
@@ -4387,7 +4389,7 @@ svn_client_conflict_get_operation(svn_wc
  */
 svn_wc_conflict_action_t
 svn_client_conflict_get_incoming_change(
-  svn_wc_conflict_description2_t *conflict);
+  const svn_wc_conflict_description2_t *conflict);
 
 /**
  * Return the reason why the attempted action performed by an update, switch,
@@ -4401,7 +4403,8 @@ svn_client_conflict_get_incoming_change(
  * @since New in 1.10. 
  */
 svn_wc_conflict_reason_t
-svn_client_conflict_get_local_change(svn_wc_conflict_description2_t *conflict);
+svn_client_conflict_get_local_change(
+  const svn_wc_conflict_description2_t *conflict);
 
 /**
  * Accessor functions for svn_wc_conflict_description2_t. This is a temporary

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1683305&r1=1683304&r2=1683305&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Jun  3 12:01:39 2015
@@ -149,26 +149,29 @@ svn_client_resolve(const char *path,
 /*** Dealing with conflicts. ***/
 
 const char *
-svn_client_conflict_get_local_abspath(svn_wc_conflict_description2_t *conflict)
+svn_client_conflict_get_local_abspath(
+  const svn_wc_conflict_description2_t *conflict)
 {
   return conflict->local_abspath;
 }
 
 svn_wc_operation_t
-svn_client_conflict_get_operation(svn_wc_conflict_description2_t *conflict)
+svn_client_conflict_get_operation(
+  const svn_wc_conflict_description2_t *conflict)
 {
   return conflict->operation;
 }
 
 svn_wc_conflict_action_t
 svn_client_conflict_get_incoming_change(
-  svn_wc_conflict_description2_t *conflict)
+  const svn_wc_conflict_description2_t *conflict)
 {
   return conflict->action;
 }
 
 svn_wc_conflict_reason_t
-svn_client_conflict_get_local_change(svn_wc_conflict_description2_t *conflict)
+svn_client_conflict_get_local_change(
+  const svn_wc_conflict_description2_t *conflict)
 {
   return conflict->reason;
 }



Mime
View raw message