Author: ivan
Date: Fri Oct 14 13:40:14 2016
New Revision: 1764895

URL: http://svn.apache.org/viewvc?rev=1764895&view=rev
Log:
Rename svn_client_conflict_option_describe() to
svn_client_conflict_option_get_description().

* subversion/include/svn_client.h
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_option_describe): Rename to
   svn_client_conflict_option_get_description.

* subversion/svn/conflict-callbacks.c
  (find_option_by_builtin): Adapt callers.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/conflicts.c
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1764895&r1=1764894&r2=1764895&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Oct 14 13:40:14 2016
@@ -4744,8 +4744,8 @@ svn_client_conflict_option_get_label(svn
  * @since New in 1.10.
  */
 const char *
-svn_client_conflict_option_describe(svn_client_conflict_option_t *option,
-                                    apr_pool_t *result_pool);
+svn_client_conflict_option_get_description(svn_client_conflict_option_t 
*option,
+                                           apr_pool_t *result_pool);
 
 /**
  * Return the absolute path to the conflicted working copy node described

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1764895&r1=1764894&r2=1764895&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Oct 14 13:40:14 
2016
@@ -8776,8 +8776,8 @@ svn_client_conflict_option_get_label(svn
 }
 
 const char *
-svn_client_conflict_option_describe(svn_client_conflict_option_t *option,
-                                    apr_pool_t *result_pool)
+svn_client_conflict_option_get_description(svn_client_conflict_option_t 
*option,
+                                           apr_pool_t *result_pool)
 {
   return apr_pstrdup(result_pool, option->description);
 }

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1764895&r1=1764894&r2=1764895&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Oct 14 13:40:14 
2016
@@ -560,7 +560,7 @@ find_option_by_builtin(client_option_t *
           client_opt->label = svn_client_conflict_option_get_label(
               builtin_option,
               result_pool);
-          client_opt->long_desc = svn_client_conflict_option_describe(
+          client_opt->long_desc = svn_client_conflict_option_get_description(
                                     builtin_option,
                                     result_pool);
           client_opt->accept_arg = opt->accept_arg;


Reply via email to