subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1206123 - /subversion/branches/moves-scan-log/subversion/svn/main.c
Date Fri, 25 Nov 2011 11:18:15 GMT
Author: stsp
Date: Fri Nov 25 11:18:14 2011
New Revision: 1206123

URL: http://svn.apache.org/viewvc?rev=1206123&view=rev
Log:
On the moves-scan-log branch:

* subversion/svn/main.c
  (main): Avoid a "passing parameter 1 from incompatible pointer type"
   warning in the call to svn_cl__conflict_baton_make() by passing a
   pointer-pointer of the right type instead of a pointer-to-void-pointer.

Modified:
    subversion/branches/moves-scan-log/subversion/svn/main.c

Modified: subversion/branches/moves-scan-log/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/svn/main.c?rev=1206123&r1=1206122&r2=1206123&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/svn/main.c (original)
+++ subversion/branches/moves-scan-log/subversion/svn/main.c Fri Nov 25 11:18:14 2011
@@ -2602,6 +2602,7 @@ main(int argc, const char *argv[])
     }
   else
     {
+      svn_cl__conflict_baton_t * conflict_baton2;
       svn_cmdline_prompt_baton_t *pb = apr_palloc(pool, sizeof(*pb));
       pb->cancel_func = ctx->cancel_func;
       pb->cancel_baton = ctx->cancel_baton;
@@ -2626,12 +2627,13 @@ main(int argc, const char *argv[])
       ctx->conflict_func = NULL;
       ctx->conflict_baton = NULL;
       ctx->conflict_func2 = svn_cl__conflict_handler;
-      SVN_INT_ERR(svn_cl__conflict_baton_make(&ctx->conflict_baton2,
+      SVN_INT_ERR(svn_cl__conflict_baton_make(&conflict_baton2,
                                               opt_state.accept_which,
                                               ctx->config,
                                               opt_state.editor_cmd,
                                               pb,
                                               pool));
+      ctx->conflict_baton2 = conflict_baton2;
     }
 
   /* And now we finally run the subcommand. */



Mime
View raw message