You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/01/23 13:15:59 UTC
svn commit: r1437360 -
/subversion/trunk/subversion/libsvn_client/copy_foreign.c
Author: philip
Date: Wed Jan 23 12:15:59 2013
New Revision: 1437360
URL: http://svn.apache.org/viewvc?rev=1437360&view=rev
Log:
* subversion/libsvn_client/copy_foreign.c
(copy_foreign_dir): Adjust variables to avoid gcc "incompatible pointer"
warnings about const.
Modified:
subversion/trunk/subversion/libsvn_client/copy_foreign.c
Modified: subversion/trunk/subversion/libsvn_client/copy_foreign.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy_foreign.c?rev=1437360&r1=1437359&r2=1437360&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy_foreign.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy_foreign.c Wed Jan 23 12:15:59 2013
@@ -398,8 +398,9 @@ copy_foreign_dir(svn_ra_session_t *ra_se
{
struct edit_baton_t eb;
svn_delta_editor_t *editor = svn_delta_default_editor(scratch_pool);
- void *baton = &eb;
- svn_ra_reporter3_t *reporter;
+ const svn_delta_editor_t *wrapped_editor;
+ void *wrapped_baton;
+ const svn_ra_reporter3_t *reporter;
void *reporter_baton;
eb.pool = scratch_pool;
@@ -422,13 +423,14 @@ copy_foreign_dir(svn_ra_session_t *ra_se
editor->close_file = file_close;
SVN_ERR(svn_delta_get_cancellation_editor(cancel_func, cancel_baton,
- editor, baton,
- &editor, &baton,
+ editor, &eb,
+ &wrapped_editor, &wrapped_baton,
scratch_pool));
SVN_ERR(svn_ra_do_update2(ra_session, &reporter, &reporter_baton,
location->rev, "", svn_depth_infinity,
- FALSE, editor, baton, scratch_pool));
+ FALSE, wrapped_editor, wrapped_baton,
+ scratch_pool));
SVN_ERR(reporter->set_path(reporter_baton, "", location->rev, depth,
TRUE /* incomplete */,