subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1440424 - in /subversion/trunk/subversion: include/private/svn_diff_tree.h libsvn_client/merge.c libsvn_diff/diff_tree.c
Date Wed, 30 Jan 2013 14:11:20 GMT
Author: stsp
Date: Wed Jan 30 14:11:20 2013
New Revision: 1440424

URL: http://svn.apache.org/viewvc?rev=1440424&view=rev
Log:
Fix inconsistent use of 'const' in the svn_diff_tree code.

Fixes GCC warning:
  subversion/libsvn_client/merge.c:9109: warning: passing argument 1 of
  'svn_wc__wrap_diff_callbacks' from incompatible pointer type

* subversion/include/private/svn_diff_tree.h.
  subversion/libsvn_diff/diff_tree.c
  (svn_diff__tree_processor_tee_create): Make both processor parameters 'const'.

* subversion/libsvn_client/merge.c
  (do_merge): Declare the callback processor as 'const'.


Modified:
    subversion/trunk/subversion/include/private/svn_diff_tree.h
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/libsvn_diff/diff_tree.c

Modified: subversion/trunk/subversion/include/private/svn_diff_tree.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_diff_tree.h?rev=1440424&r1=1440423&r2=1440424&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_diff_tree.h (original)
+++ subversion/trunk/subversion/include/private/svn_diff_tree.h Wed Jan 30 14:11:20 2013
@@ -242,8 +242,8 @@ svn_diff__tree_processor_reverse_create(
  * @since New in 1.8.
  */ /* Used by libsvn clients repository diff */
 const svn_diff_tree_processor_t *
-svn_diff__tree_processor_tee_create(svn_diff_tree_processor_t * processor1,
-                                    svn_diff_tree_processor_t * processor2,
+svn_diff__tree_processor_tee_create(const svn_diff_tree_processor_t *processor1,
+                                    const svn_diff_tree_processor_t *processor2,
                                     apr_pool_t *result_pool);
 
 

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1440424&r1=1440423&r2=1440424&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 30 14:11:20 2013
@@ -9103,7 +9103,7 @@ do_merge(apr_hash_t **modified_subtrees,
   merge_cmd_baton.nrb.pool = result_pool;
 
   {
-    svn_diff_tree_processor_t *callback_processor;
+    const svn_diff_tree_processor_t *callback_processor;
     svn_diff_tree_processor_t *merge_processor;
 
     SVN_ERR(svn_wc__wrap_diff_callbacks(&callback_processor,

Modified: subversion/trunk/subversion/libsvn_diff/diff_tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_tree.c?rev=1440424&r1=1440423&r2=1440424&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_tree.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_tree.c Wed Jan 30 14:11:20 2013
@@ -969,8 +969,8 @@ tee_node_absent(const char *relpath,
 }
 
 const svn_diff_tree_processor_t *
-svn_diff__tree_processor_tee_create(svn_diff_tree_processor_t * processor1,
-                                    svn_diff_tree_processor_t * processor2,
+svn_diff__tree_processor_tee_create(const svn_diff_tree_processor_t *processor1,
+                                    const svn_diff_tree_processor_t *processor2,
                                     apr_pool_t *result_pool)
 {
   struct tee_baton_t *tb = apr_pcalloc(result_pool, sizeof(*tb));



Mime
View raw message