diff options
Diffstat (limited to 'subversion/libsvn_fs_fs/recovery.c')
| -rw-r--r-- | subversion/libsvn_fs_fs/recovery.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/subversion/libsvn_fs_fs/recovery.c b/subversion/libsvn_fs_fs/recovery.c index 125d47a1f3707..eef06f65942ae 100644 --- a/subversion/libsvn_fs_fs/recovery.c +++ b/subversion/libsvn_fs_fs/recovery.c @@ -197,9 +197,7 @@ recover_find_max_ids(svn_fs_t *fs, stored in the representation. Note that this is a directory, i.e. represented using the hash format on disk and can never have 0 length. */ baton.pool = pool; - baton.remaining = noderev->data_rep->expanded_size - ? noderev->data_rep->expanded_size - : noderev->data_rep->size; + baton.remaining = noderev->data_rep->expanded_size; stream = svn_stream_create(&baton, pool); svn_stream_set_read2(stream, NULL /* only full read support */, read_handler_recover); @@ -211,7 +209,7 @@ recover_find_max_ids(svn_fs_t *fs, { svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool); - svn_error_clear(svn_stream_close(stream)); + err = svn_error_compose_create(err, svn_stream_close(stream)); return svn_error_quick_wrapf(err, _("malformed representation for node-revision '%s'"), id_str->data); |