aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/svnfsfs/load-index-cmd.c
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2020-05-31 20:58:28 +0000
committerDimitry Andric <dim@FreeBSD.org>2020-05-31 20:58:28 +0000
commitbbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (patch)
tree726fcf32b39ca8976d7aa51b67c7236509f1bde4 /subversion/svnfsfs/load-index-cmd.c
parent38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff)
downloadsrc-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.tar.gz
src-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.zip
Notes
Notes: svn path=/vendor/subversion/dist/; revision=361669 svn path=/vendor/subversion/subversion-1.14.0/; revision=361670; tag=vendor/subversion/subversion-1.14.0
Diffstat (limited to 'subversion/svnfsfs/load-index-cmd.c')
-rw-r--r--subversion/svnfsfs/load-index-cmd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/subversion/svnfsfs/load-index-cmd.c b/subversion/svnfsfs/load-index-cmd.c
index e3b5c0d718bf..88e2613924c4 100644
--- a/subversion/svnfsfs/load-index-cmd.c
+++ b/subversion/svnfsfs/load-index-cmd.c
@@ -135,6 +135,7 @@ load_index(const char *path,
svn_revnum_t revision = SVN_INVALID_REVNUM;
apr_array_header_t *entries = apr_array_make(pool, 16, sizeof(void*));
apr_pool_t *iterpool = svn_pool_create(pool);
+ svn_fs_fs__ioctl_load_index_input_t ioctl_input = {0};
/* Check repository type and open it. */
SVN_ERR(open_fs(&fs, path, pool));
@@ -147,7 +148,7 @@ load_index(const char *path,
/* Get the next line from the input and stop if there is none. */
svn_pool_clear(iterpool);
- svn_stream_readline(input, &line, "\n", &eol, iterpool);
+ SVN_ERR(svn_stream_readline(input, &line, "\n", &eol, iterpool));
if (eol)
break;
@@ -173,7 +174,10 @@ load_index(const char *path,
}
/* Rewrite the indexes. */
- SVN_ERR(svn_fs_fs__load_index(fs, revision, entries, iterpool));
+ ioctl_input.revision = revision;
+ ioctl_input.entries = entries;
+ SVN_ERR(svn_fs_ioctl(fs, SVN_FS_FS__IOCTL_LOAD_INDEX, &ioctl_input, NULL,
+ NULL, NULL, pool, pool));
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;