You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/08/14 13:45:08 UTC
svn commit: r1695868 - in
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer:
analyze-cmd.c logic.c mergeinfo-normalizer.h normalize-cmd.c
remove-branches-cmd.c
Author: stefan2
Date: Fri Aug 14 11:45:07 2015
New Revision: 1695868
URL: http://svn.apache.org/r1695868
Log:
On the svn-mergeinfo-normalizer branch:
Remove an unused parameter.
* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(svn_min__run_normalize): Drop OS parameter.
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(svn_min__run_normalize): Same.
* tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c
(svn_min__analyze): Update caller.
* tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
(svn_min__normalize): Same.
* tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c
(svn_min__remove_branches): Same.
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c?rev=1695868&r1=1695867&r2=1695868&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/analyze-cmd.c Fri Aug 14 11:45:07 2015
@@ -53,7 +53,7 @@ svn_min__analyze(apr_getopt_t *os,
cmd_baton->opt_state->run_analysis = TRUE;
cmd_baton->opt_state->dry_run = TRUE;
- SVN_ERR(svn_min__run_normalize(os, baton, pool));
+ SVN_ERR(svn_min__run_normalize(baton, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1695868&r1=1695867&r2=1695868&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c Fri Aug 14 11:45:07 2015
@@ -1319,10 +1319,8 @@ show_obsoletes_summary(svn_min__branch_l
return SVN_NO_ERROR;
}
-/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
-svn_min__run_normalize(apr_getopt_t *os,
- void *baton,
+svn_min__run_normalize(void *baton,
apr_pool_t *pool)
{
svn_min__cmd_baton_t *cmd_baton = baton;
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h?rev=1695868&r1=1695867&r2=1695868&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h Fri Aug 14 11:45:07 2015
@@ -262,8 +262,7 @@ svn_min__branch_deleted_list(svn_min__br
apr_pool_t *scratch_pool);
svn_error_t *
-svn_min__run_normalize(apr_getopt_t *os,
- void *baton,
+svn_min__run_normalize(void *baton,
apr_pool_t *pool);
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c?rev=1695868&r1=1695867&r2=1695868&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/normalize-cmd.c Fri Aug 14 11:45:07 2015
@@ -46,7 +46,7 @@ svn_min__normalize(apr_getopt_t *os,
&& !cmd_baton->opt_state->combine_ranges)
cmd_baton->opt_state->remove_redundants = TRUE;
- SVN_ERR(svn_min__run_normalize(os, baton, pool));
+ SVN_ERR(svn_min__run_normalize(baton, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c?rev=1695868&r1=1695867&r2=1695868&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c Fri Aug 14 11:45:07 2015
@@ -53,7 +53,7 @@ svn_min__remove_branches(apr_getopt_t *o
cmd_baton->opt_state->remove_obsoletes = TRUE;
cmd_baton->lookup = svn_min__branch_lookup_from_paths(branches, pool);
- SVN_ERR(svn_min__run_normalize(os, baton, pool));
+ SVN_ERR(svn_min__run_normalize(baton, pool));
return SVN_NO_ERROR;
}