aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/libsvn_fs_x
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/libsvn_fs_x
parent38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff)
downloadsrc-vendor/subversion.tar.gz
src-vendor/subversion.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/libsvn_fs_x')
-rw-r--r--subversion/libsvn_fs_x/cached_data.c2
-rw-r--r--subversion/libsvn_fs_x/changes.c2
-rw-r--r--subversion/libsvn_fs_x/dag_cache.c6
-rw-r--r--subversion/libsvn_fs_x/dag_cache.h2
-rw-r--r--subversion/libsvn_fs_x/fs.c6
-rw-r--r--subversion/libsvn_fs_x/fs_x.c2
-rw-r--r--subversion/libsvn_fs_x/libsvn_fs_x.pc.in8
-rw-r--r--subversion/libsvn_fs_x/low_level.c8
-rw-r--r--subversion/libsvn_fs_x/pack.c12
-rw-r--r--subversion/libsvn_fs_x/rep-cache-db.h2
-rw-r--r--subversion/libsvn_fs_x/revprops.c6
-rw-r--r--subversion/libsvn_fs_x/temp_serializer.c4
-rw-r--r--subversion/libsvn_fs_x/transaction.c4
-rw-r--r--subversion/libsvn_fs_x/tree.c2
-rw-r--r--subversion/libsvn_fs_x/verify.c2
15 files changed, 35 insertions, 33 deletions
diff --git a/subversion/libsvn_fs_x/cached_data.c b/subversion/libsvn_fs_x/cached_data.c
index 909842e5c456..c9bca2f006c6 100644
--- a/subversion/libsvn_fs_x/cached_data.c
+++ b/subversion/libsvn_fs_x/cached_data.c
@@ -2229,7 +2229,7 @@ svn_fs_x__get_contents_from_file(svn_stream_t **contents_p,
rb->filehandle_pool, rb->scratch_pool));
/* Insert the access to REP as the first element of the delta chain. */
- svn_sort__array_insert(rb->rs_list, &rs, 0);
+ SVN_ERR(svn_sort__array_insert2(rb->rs_list, &rs, 0));
}
/* Now, the baton is complete and we can assemble the stream around it. */
diff --git a/subversion/libsvn_fs_x/changes.c b/subversion/libsvn_fs_x/changes.c
index c385e59da7f6..419bc41c076f 100644
--- a/subversion/libsvn_fs_x/changes.c
+++ b/subversion/libsvn_fs_x/changes.c
@@ -184,7 +184,7 @@ svn_fs_x__changes_append_list(apr_size_t *list_index,
/* simply append the list and all changes */
for (i = 0; i < list->nelts; ++i)
- append_change(changes, APR_ARRAY_IDX(list, i, svn_fs_x__change_t *));
+ SVN_ERR(append_change(changes, APR_ARRAY_IDX(list, i, svn_fs_x__change_t *)));
/* terminate the list by storing the next changes offset */
APR_ARRAY_PUSH(changes->offsets, int) = changes->changes->nelts;
diff --git a/subversion/libsvn_fs_x/dag_cache.c b/subversion/libsvn_fs_x/dag_cache.c
index 896c56fb3203..34a0117fd599 100644
--- a/subversion/libsvn_fs_x/dag_cache.c
+++ b/subversion/libsvn_fs_x/dag_cache.c
@@ -807,7 +807,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p,
or if it is a branch point that we are accessing via its original
copy destination path. */
svn_fs_x__dag_get_copyroot(&copyroot_rev, &copyroot_path, child->node);
- SVN_ERR(svn_fs_x__revision_root(&copyroot_root, fs, copyroot_rev,
+ SVN_ERR(svn_fs_x__revision_root(&copyroot_root, fs, copyroot_rev,
scratch_pool));
SVN_ERR(svn_fs_x__get_temp_dag_node(&copyroot_node, copyroot_root,
copyroot_path, scratch_pool));
@@ -833,7 +833,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p,
}
/* Allocate a new svn_fs_x__dag_path_t node from RESULT_POOL, containing
- NODE, ENTRY and PARENT, all copied into RESULT_POOL as well. */
+ NODE, ENTRY and PARENT; NODE and ENTRY are copied into RESULT_POOL. */
static svn_fs_x__dag_path_t *
make_parent_path(dag_node_t *node,
const svn_stringbuf_t *entry,
@@ -909,7 +909,7 @@ svn_fs_x__get_dag_path(svn_fs_x__dag_path_t **dag_path_p,
{
/* If this was the last path component, and the caller
said it was optional, then don't return an error;
- just put a NULL node pointer in the path.
+ just put a NULL node pointer in the path.
*/
if ((flags & svn_fs_x__dag_path_last_optional)
&& (path_len == path.len))
diff --git a/subversion/libsvn_fs_x/dag_cache.h b/subversion/libsvn_fs_x/dag_cache.h
index fd78bb74f9e8..9d95361b0eab 100644
--- a/subversion/libsvn_fs_x/dag_cache.h
+++ b/subversion/libsvn_fs_x/dag_cache.h
@@ -103,7 +103,7 @@ typedef struct svn_fs_x__dag_path_t
IS_TXN_PATH must be set. If IS_TXN_PATH is FALSE, no copy ID
inheritance information will be calculated for the *PARENT_PATH_P chain.
- If FLAGS & open_path_last_optional is zero, return the error
+ If FLAGS & svn_fs_x__dag_path_last_optional is zero, return the error
SVN_ERR_FS_NOT_FOUND if the node PATH refers to does not exist. If
non-zero, require all the parent directories to exist as normal,
but if the final path component doesn't exist, simply return a path
diff --git a/subversion/libsvn_fs_x/fs.c b/subversion/libsvn_fs_x/fs.c
index 7eb0add2def0..cf4613e9a9bf 100644
--- a/subversion/libsvn_fs_x/fs.c
+++ b/subversion/libsvn_fs_x/fs.c
@@ -310,7 +310,8 @@ static fs_vtable_t fs_vtable = {
x_info,
svn_fs_x__verify_root,
x_freeze,
- x_set_errcall
+ x_set_errcall,
+ NULL /* ioctl */
};
@@ -641,7 +642,8 @@ static fs_library_vtable_t library_vtable = {
x_logfiles,
NULL /* parse_id */,
x_set_svn_fs_open,
- x_info_dup
+ x_info_dup,
+ NULL /* ioctl */
};
svn_error_t *
diff --git a/subversion/libsvn_fs_x/fs_x.c b/subversion/libsvn_fs_x/fs_x.c
index ba1982f278bb..09593572a4ef 100644
--- a/subversion/libsvn_fs_x/fs_x.c
+++ b/subversion/libsvn_fs_x/fs_x.c
@@ -951,7 +951,7 @@ write_revision_zero(svn_fs_t *fs,
SVN_ERR(svn_io_file_open(&apr_file,
svn_fs_x__path_revprops(fs, 0, scratch_pool),
- APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
+ APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
scratch_pool));
SVN_ERR(svn_fs_x__write_non_packed_revprops(apr_file, proplist,
scratch_pool));
diff --git a/subversion/libsvn_fs_x/libsvn_fs_x.pc.in b/subversion/libsvn_fs_x/libsvn_fs_x.pc.in
index 46d93dcebcd1..5d7d58ba88d1 100644
--- a/subversion/libsvn_fs_x/libsvn_fs_x.pc.in
+++ b/subversion/libsvn_fs_x/libsvn_fs_x.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libsvn_fs_x
Description: Subversion FSX Repository Filesystem Library
Version: @PACKAGE_VERSION@
-Requires: apr-util-@SVN_APR_MAJOR_VERSION@ apr-@SVN_APR_MAJOR_VERSION@
-Requires.private: libsvn_delta libsvn_subr libsvn_fs_util
-Libs: -L${libdir} -lsvn_fs_x
-Cflags: -I${includedir}
+Requires: apr-util-@SVN_APR_MAJOR_VERSION@, apr-@SVN_APR_MAJOR_VERSION@
+Requires.private: libsvn_delta, libsvn_subr, libsvn_fs_util
+Libs: -L${libdir} -lsvn_fs_x-1
+Cflags: -I${includedir}/subversion-1
diff --git a/subversion/libsvn_fs_x/low_level.c b/subversion/libsvn_fs_x/low_level.c
index 5c7e3ad26610..e4cf4b786f7f 100644
--- a/subversion/libsvn_fs_x/low_level.c
+++ b/subversion/libsvn_fs_x/low_level.c
@@ -167,10 +167,10 @@ svn_fs_x__parse_footer(apr_off_t *l2p_offset,
"P2L offset %s must be larger than L2P offset %s"
" in r%ld footer",
apr_psprintf(result_pool,
- "%" APR_UINT64_T_HEX_FMT,
+ "0x%" APR_UINT64_T_HEX_FMT,
(apr_uint64_t)*p2l_offset),
apr_psprintf(result_pool,
- "%" APR_UINT64_T_HEX_FMT,
+ "0x%" APR_UINT64_T_HEX_FMT,
(apr_uint64_t)*l2p_offset),
rev);
@@ -998,7 +998,7 @@ svn_fs_x__read_changes(apr_array_header_t **changes,
SVN_ERR(read_change(&change, stream, result_pool, iterpool));
if (!change)
break;
-
+
APR_ARRAY_PUSH(*changes, svn_fs_x__change_t*) = change;
}
svn_pool_destroy(iterpool);
@@ -1131,7 +1131,7 @@ svn_fs_x__write_changes(svn_stream_t *stream,
}
if (terminate_list)
- svn_stream_puts(stream, "\n");
+ SVN_ERR(svn_stream_puts(stream, "\n"));
svn_pool_destroy(iterpool);
diff --git a/subversion/libsvn_fs_x/pack.c b/subversion/libsvn_fs_x/pack.c
index 095b04ec8297..ceb9e7fccba2 100644
--- a/subversion/libsvn_fs_x/pack.c
+++ b/subversion/libsvn_fs_x/pack.c
@@ -2204,9 +2204,9 @@ pack_body(void *baton,
if (fully_packed)
{
if (pb->notify_func)
- (*pb->notify_func)(pb->notify_baton,
- ffd->min_unpacked_rev / ffd->max_files_per_dir,
- svn_fs_pack_notify_noop, scratch_pool);
+ SVN_ERR(pb->notify_func(pb->notify_baton,
+ ffd->min_unpacked_rev / ffd->max_files_per_dir,
+ svn_fs_pack_notify_noop, scratch_pool));
return SVN_NO_ERROR;
}
@@ -2258,9 +2258,9 @@ svn_fs_x__pack(svn_fs_t *fs,
svn_fs_x__data_t *ffd = fs->fsap_data;
if (notify_func)
- (*notify_func)(notify_baton,
- ffd->min_unpacked_rev / ffd->max_files_per_dir,
- svn_fs_pack_notify_noop, scratch_pool);
+ SVN_ERR(notify_func(notify_baton,
+ ffd->min_unpacked_rev / ffd->max_files_per_dir,
+ svn_fs_pack_notify_noop, scratch_pool));
return SVN_NO_ERROR;
}
diff --git a/subversion/libsvn_fs_x/rep-cache-db.h b/subversion/libsvn_fs_x/rep-cache-db.h
index c212760651d5..67ab6302126e 100644
--- a/subversion/libsvn_fs_x/rep-cache-db.h
+++ b/subversion/libsvn_fs_x/rep-cache-db.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from rep-cache-db.sql and subversion/libsvn_fs_x/token-map.h.
+/* This file is automatically generated from rep-cache-db.sql and token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_CREATE_SCHEMA 0
diff --git a/subversion/libsvn_fs_x/revprops.c b/subversion/libsvn_fs_x/revprops.c
index f98c04478f24..4b38fcefcbe2 100644
--- a/subversion/libsvn_fs_x/revprops.c
+++ b/subversion/libsvn_fs_x/revprops.c
@@ -449,7 +449,7 @@ verify_checksum(svn_stringbuf_t *content,
content->len, scratch_pool));
if (!svn_checksum_match(actual, expected))
- SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
+ SVN_ERR(svn_checksum_mismatch_err(expected, actual, scratch_pool,
"checksum mismatch"));
return SVN_NO_ERROR;
@@ -1203,7 +1203,7 @@ repack_file_open(apr_file_t **file,
if (revprops->entry.start_rev == start_rev)
APR_ARRAY_IDX(revprops->manifest, idx, manifest_entry_t) = new_entry;
else
- svn_sort__array_insert(revprops->manifest, &new_path, idx + 1);
+ SVN_ERR(svn_sort__array_insert2(revprops->manifest, &new_path, idx + 1));
/* open the file */
new_path = get_revprop_pack_filepath(revprops, &new_entry, scratch_pool);
@@ -1424,7 +1424,7 @@ svn_fs_x__set_revision_proplist(svn_fs_t *fs,
scratch_pool));
else
SVN_ERR(write_non_packed_revprop(&final_path, &tmp_path,
- fs, rev, proplist, batch,
+ fs, rev, proplist, batch,
scratch_pool, scratch_pool));
/* We use the rev file of this revision as the perms reference,
diff --git a/subversion/libsvn_fs_x/temp_serializer.c b/subversion/libsvn_fs_x/temp_serializer.c
index efabf1b60771..b1aaa2b2f9df 100644
--- a/subversion/libsvn_fs_x/temp_serializer.c
+++ b/subversion/libsvn_fs_x/temp_serializer.c
@@ -925,13 +925,13 @@ slowly_replace_dir_entry(void **data,
APR_ARRAY_IDX(entries, idx, svn_fs_x__dirent_t *)
= replace_baton->new_entry;
else
- svn_sort__array_insert(entries, &replace_baton->new_entry, idx);
+ SVN_ERR(svn_sort__array_insert2(entries, &replace_baton->new_entry, idx));
}
else
{
/* Remove the old ENTRY. */
if (entry)
- svn_sort__array_delete(entries, idx, 1);
+ SVN_ERR(svn_sort__array_delete2(entries, idx, 1));
}
return svn_fs_x__serialize_dir_entries(data, data_len, dir, pool);
diff --git a/subversion/libsvn_fs_x/transaction.c b/subversion/libsvn_fs_x/transaction.c
index 52c958f3ece1..b54caf480c7f 100644
--- a/subversion/libsvn_fs_x/transaction.c
+++ b/subversion/libsvn_fs_x/transaction.c
@@ -881,7 +881,7 @@ unparse_dir_entry(svn_fs_x__dirent_t *dirent,
apr_size_t to_write;
apr_size_t name_len = strlen(dirent->name);
- /* A buffer with sufficient space for
+ /* A buffer with sufficient space for
* - entry name + 1 terminating NUL
* - 1 byte for the node kind
* - 2 numbers in 7b/8b encoding for the noderev-id
@@ -1259,7 +1259,7 @@ get_and_increment_txn_key_body(void *baton,
SVN_ERR(svn_io_check_path(txn_dir, &kind, iterpool));
if (kind == svn_node_none)
{
- svn_io_dir_make(txn_dir, APR_OS_DEFAULT, iterpool);
+ SVN_ERR(svn_io_dir_make(txn_dir, APR_OS_DEFAULT, iterpool));
break;
}
diff --git a/subversion/libsvn_fs_x/tree.c b/subversion/libsvn_fs_x/tree.c
index 36374afc1cce..6fe34f3d0a3c 100644
--- a/subversion/libsvn_fs_x/tree.c
+++ b/subversion/libsvn_fs_x/tree.c
@@ -2060,7 +2060,7 @@ typedef struct text_baton_t
* svn_fs_apply_text() ==> ... ==> txn_body_fulltext_finalize_edits()
*/
-/* Write function for the publically returned stream. */
+/* Write function for the publicly returned stream. */
static svn_error_t *
text_stream_writer(void *baton,
const char *data,
diff --git a/subversion/libsvn_fs_x/verify.c b/subversion/libsvn_fs_x/verify.c
index 6f03201b2b8e..c1351baff737 100644
--- a/subversion/libsvn_fs_x/verify.c
+++ b/subversion/libsvn_fs_x/verify.c
@@ -179,7 +179,7 @@ verify_index_checksum(svn_fs_x__revision_file_t *file,
SVN_ERR(svn_fs_x__rev_file_name(&file_name, file, scratch_pool));
SVN_ERR(svn_checksum_mismatch_err(index_info->checksum, actual,
- scratch_pool,
+ scratch_pool,
_("%s checksum mismatch in file %s"),
name, file_name));
}