svn commit: r1622701 - /subversion/branches/log-message-templates/subversion/svn/copy-cmd.c

[st...@apache.org]

Author: stsp
Date: Fri Sep  5 13:58:00 2014
New Revision: 1622701

URL: http://svn.apache.org/r1622701
Log:
On the log-message-templates branch, fix a crash.

* subversion/svn/copy-cmd.c
  (svn_cl__copy): Fully convert this function to use log_msg_func4.

Modified:
    subversion/branches/log-message-templates/subversion/svn/copy-cmd.c

Modified: subversion/branches/log-message-templates/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/svn/copy-cmd.c?rev=1622701&r1=1622700&r2=1622701&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/log-message-templates/subversion/svn/copy-cmd.c Fri Sep  5 13:58:00 2014
@@ -155,7 +155,7 @@ svn_cl__copy(apr_getopt_t *os,
 
   if (! dst_is_url)
     {
-      ctx->log_msg_func3 = NULL;
+      ctx->log_msg_func4 = NULL;
       if (opt_state->message || opt_state->filedata || opt_state->revprop_table)
         return svn_error_create
           (SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE, NULL,
@@ -163,7 +163,7 @@ svn_cl__copy(apr_getopt_t *os,
              "or revision properties"));
     }
 
-  if (ctx->log_msg_func3)
+  if (ctx->log_msg_func4)
     SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton4), opt_state,
                                        NULL, ctx->config, pool));