Author: stsp
Date: Fri Sep 5 14:20:49 2014
New Revision: 1622707
URL: http://svn.apache.org/r1622707
Log:
On the log-message-templates branch, fix several crashes.
* subversion/svn/copy-cmd.c
(svn_cl__copy): Fully convert to log_msg_func4.
* subversion/svn/delete-cmd.c
(svn_cl__delete): Fully convert to log_msg_func4.
* subversion/svn/mkdir-cmd.c
(svn_cl__mkdir): Fully convert to log_msg_func4.
* subversion/svn/move-cmd.c
(svn_cl__move): Fully convert to log_msg_func4.
* subversion/svn/propedit-cmd.c
(svn_cl__propedit): Fully convert to log_msg_func4.
Modified:
subversion/branches/log-message-templates/subversion/svn/copy-cmd.c
subversion/branches/log-message-templates/subversion/svn/delete-cmd.c
subversion/branches/log-message-templates/subversion/svn/mkdir-cmd.c
subversion/branches/log-message-templates/subversion/svn/move-cmd.c
subversion/branches/log-message-templates/subversion/svn/propedit-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=1622707&r1=1622706&r2=1622707&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 14:20:49 2014
@@ -174,7 +174,7 @@ svn_cl__copy(apr_getopt_t *os,
NULL,
ctx, pool);
- if (ctx->log_msg_func3)
+ if (ctx->log_msg_func4)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton4, err, pool));
else if (err)
return svn_error_trace(err);
Modified: subversion/branches/log-message-templates/subversion/svn/delete-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/svn/delete-cmd.c?rev=1622707&r1=1622706&r2=1622707&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/svn/delete-cmd.c
(original)
+++ subversion/branches/log-message-templates/subversion/svn/delete-cmd.c Fri
Sep 5 14:20:49 2014
@@ -61,7 +61,7 @@ svn_cl__delete(apr_getopt_t *os,
if (! 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
@@ -86,7 +86,7 @@ svn_cl__delete(apr_getopt_t *os,
if (err)
err = svn_cl__may_need_force(err);
- if (ctx->log_msg_func3)
+ if (ctx->log_msg_func4)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton4, err, pool));
else if (err)
return svn_error_trace(err);
Modified: subversion/branches/log-message-templates/subversion/svn/mkdir-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/svn/mkdir-cmd.c?rev=1622707&r1=1622706&r2=1622707&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/svn/mkdir-cmd.c
(original)
+++ subversion/branches/log-message-templates/subversion/svn/mkdir-cmd.c Fri
Sep 5 14:20:49 2014
@@ -60,7 +60,7 @@ svn_cl__mkdir(apr_getopt_t *os,
if (! svn_path_is_url(APR_ARRAY_IDX(targets, 0, const char *)))
{
- 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
@@ -82,7 +82,7 @@ svn_cl__mkdir(apr_getopt_t *os,
(opt_state->quiet ? NULL :
svn_cl__print_commit_info),
NULL, ctx, pool);
- if (ctx->log_msg_func3)
+ if (ctx->log_msg_func4)
err = svn_cl__cleanup_log_msg(ctx->log_msg_baton4, err, pool);
if (err)
Modified: subversion/branches/log-message-templates/subversion/svn/move-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/svn/move-cmd.c?rev=1622707&r1=1622706&r2=1622707&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/svn/move-cmd.c
(original)
+++ subversion/branches/log-message-templates/subversion/svn/move-cmd.c Fri Sep
5 14:20:49 2014
@@ -70,7 +70,7 @@ svn_cl__move(apr_getopt_t *os,
if (! svn_path_is_url(dst_path))
{
- 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,
@@ -78,7 +78,7 @@ svn_cl__move(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));
Modified:
subversion/branches/log-message-templates/subversion/svn/propedit-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/log-message-templates/subversion/svn/propedit-cmd.c?rev=1622707&r1=1622706&r2=1622707&view=diff
==============================================================================
--- subversion/branches/log-message-templates/subversion/svn/propedit-cmd.c
(original)
+++ subversion/branches/log-message-templates/subversion/svn/propedit-cmd.c Fri
Sep 5 14:20:49 2014
@@ -298,7 +298,7 @@ svn_cl__propedit(apr_getopt_t *os,
svn_cl__check_boolean_prop_val(pname_utf8, edited_propval->data,
subpool);
- 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,
subpool));
@@ -327,7 +327,7 @@ svn_cl__propedit(apr_getopt_t *os,
ctx, subpool);
}
- if (ctx->log_msg_func3)
+ if (ctx->log_msg_func4)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton4,
err, pool));
else if (err)
