subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1764892 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/conflicts.c svn/conflict-callbacks.c
Date Fri, 14 Oct 2016 13:37:03 GMT
Author: ivan
Date: Fri Oct 14 13:37:03 2016
New Revision: 1764892

URL: http://svn.apache.org/viewvc?rev=1764892&view=rev
Log:
Simplify svn_client_conflict_option_describe() API to match
svn_client_conflict_option_label().

* subversion/include/svn_client.h
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_option_describe): Drop svn_error_t and scratch_pool.

* 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=1764892&r1=1764891&r2=1764892&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Oct 14 13:37:03 2016
@@ -4743,11 +4743,9 @@ svn_client_conflict_option_get_label(svn
  *
  * @since New in 1.10.
  */
-svn_error_t *
-svn_client_conflict_option_describe(const char **description,
-                                    svn_client_conflict_option_t *option,
-                                    apr_pool_t *result_pool,
-                                    apr_pool_t *scratch_pool);
+const char *
+svn_client_conflict_option_describe(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=1764892&r1=1764891&r2=1764892&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Oct 14 13:37:03 2016
@@ -8775,15 +8775,11 @@ svn_client_conflict_option_get_label(svn
   return apr_pstrdup(result_pool, option->label);
 }
 
-svn_error_t *
-svn_client_conflict_option_describe(const char **description,
-                                    svn_client_conflict_option_t *option,
-                                    apr_pool_t *result_pool,
-                                    apr_pool_t *scratch_pool)
+const char *
+svn_client_conflict_option_describe(svn_client_conflict_option_t *option,
+                                    apr_pool_t *result_pool)
 {
-  *description = apr_pstrdup(result_pool, option->description);
-
-  return SVN_NO_ERROR;
+  return apr_pstrdup(result_pool, option->description);
 }
 
 svn_error_t *

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1764892&r1=1764891&r2=1764892&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Oct 14 13:37:03 2016
@@ -560,10 +560,9 @@ find_option_by_builtin(client_option_t *
           client_opt->label = svn_client_conflict_option_get_label(
               builtin_option,
               result_pool);
-          SVN_ERR(svn_client_conflict_option_describe(&client_opt->long_desc,
-                                                      builtin_option,
-                                                      result_pool,
-                                                      scratch_pool));
+          client_opt->long_desc = svn_client_conflict_option_describe(
+                                    builtin_option,
+                                    result_pool);
           client_opt->accept_arg = opt->accept_arg;
 
           *out = client_opt;



Mime
View raw message