Author: jamessan
Date: Sun Nov 26 05:32:51 2017
New Revision: 1816363
URL: http://svn.apache.org/viewvc?rev=1816363&view=rev
Log:
Use consistent ordering for normalize_props argument, after ignore_date.
* subversion/libsvn_repos/load-fs-vtable.c
(svn_repos_load_fs6): Reorder parameters to match declaration
* subversion/svnadmin/svnadmin.c
(subcommand_load): Call svn_repos_load_fs6() with normalize_props in the
correct argument.
(subcommand_load_revprops): Call svn_repos_load_fs_revprops() with
normalize_props in the correct argument.
Found by: Coverity <https://scan.coverity.com>
(CID: 1423312)
Modified:
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/svnadmin/svnadmin.c
Modified: subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1816363&r1=1816362&r2=1816363&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Sun Nov 26
05:32:51 2017
@@ -1260,8 +1260,8 @@ svn_repos_load_fs6(svn_repos_t *repos,
svn_boolean_t use_pre_commit_hook,
svn_boolean_t use_post_commit_hook,
svn_boolean_t validate_props,
- svn_boolean_t normalize_props,
svn_boolean_t ignore_dates,
+ svn_boolean_t normalize_props,
svn_repos_notify_func_t notify_func,
void *notify_baton,
svn_cancel_func_t cancel_func,
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1816363&r1=1816362&r2=1816363&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Sun Nov 26 05:32:51 2017
@@ -1646,8 +1646,8 @@ subcommand_load(apr_getopt_t *os, void *
opt_state->use_pre_commit_hook,
opt_state->use_post_commit_hook,
!opt_state->bypass_prop_validation,
- opt_state->normalize_props,
opt_state->ignore_dates,
+ opt_state->normalize_props,
opt_state->quiet ? NULL : repos_notify_handler,
feedback_stream, check_cancel, NULL, pool);
@@ -1703,8 +1703,8 @@ subcommand_load_revprops(apr_getopt_t *o
err = svn_repos_load_fs_revprops(repos, in_stream, lower, upper,
!opt_state->bypass_prop_validation,
- opt_state->normalize_props,
opt_state->ignore_dates,
+ opt_state->normalize_props,
opt_state->quiet ? NULL
: repos_notify_handler,
feedback_stream, check_cancel, NULL, pool);
