svn commit: r1336808 - /subversion/trunk/subversion/svn/main.c

[st...@apache.org]

Author: stsp
Date: Thu May 10 17:39:07 2012
New Revision: 1336808

URL: http://svn.apache.org/viewvc?rev=1336808&view=rev
Log:
* 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.
   Also, avoid SVN_ERR() in main. Both changes are equivalent to the changes
   made in r1206109 and r1206123 on the moves-scan-log branch.

Modified:
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1336808&r1=1336807&r2=1336808&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu May 10 17:39:07 2012
@@ -2680,6 +2680,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;
@@ -2704,12 +2705,13 @@ main(int argc, const char *argv[])
       ctx->conflict_func = NULL;
       ctx->conflict_baton = NULL;
       ctx->conflict_func2 = svn_cl__conflict_handler;
-      SVN_ERR(svn_cl__conflict_baton_make(&ctx->conflict_baton2,
-                                          opt_state.accept_which,
-                                          ctx->config,
-                                          opt_state.editor_cmd,
-                                          pb,
-                                          pool));
+      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. */