Author: danielsh
Date: Sat Jul 9 00:57:05 2011
New Revision: 1144563
URL: http://svn.apache.org/viewvc?rev=1144563&view=rev
Log:
s/assert/SVN_ERR_ASSERT/
* subversion/libsvn_fs_fs/fs_fs.c
(write_change_entry, commit_body, recover_find_max_ids): As above.
Suggested by: blair
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1144563&r1=1144562&r2=1144563&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Jul 9 00:57:05 2011
@@ -5330,7 +5330,7 @@ write_change_entry(apr_file_t *file,
if (include_node_kind)
{
- assert(change->node_kind == svn_node_dir
+ SVN_ERR_ASSERT(change->node_kind == svn_node_dir
|| change->node_kind == svn_node_file);
kind_string = apr_psprintf(pool, "-%s",
change->node_kind == svn_node_dir
@@ -6371,7 +6371,7 @@ commit_body(void *baton, apr_pool_t *poo
}
/* Create the revprops shard. */
- assert(! is_packed_revprop(cb->fs, new_rev));
+ SVN_ERR_ASSERT(! is_packed_revprop(cb->fs, new_rev));
{
const char *new_dir = path_revprops_shard(cb->fs, new_rev, pool);
svn_error_t *err = svn_io_dir_make(new_dir, APR_OS_DEFAULT, pool);
@@ -6407,7 +6407,7 @@ commit_body(void *baton, apr_pool_t *poo
&date, pool));
/* Move the revprops file into place. */
- assert(! is_packed_revprop(cb->fs, new_rev));
+ SVN_ERR_ASSERT(! is_packed_revprop(cb->fs, new_rev));
revprop_filename = path_txn_props(cb->fs, cb->txn->id, pool);
final_revprop = path_revprops(cb->fs, new_rev, pool);
SVN_ERR(move_into_place(revprop_filename, final_revprop,
@@ -6881,12 +6881,12 @@ recover_find_max_ids(svn_fs_t *fs, svn_r
if (svn_fs_fs__key_compare(node_id, max_node_id) > 0)
{
- assert(strlen(node_id) < MAX_KEY_SIZE);
+ SVN_ERR_ASSERT(strlen(node_id) < MAX_KEY_SIZE);
apr_cpystrn(max_node_id, node_id, MAX_KEY_SIZE);
}
if (svn_fs_fs__key_compare(copy_id, max_copy_id) > 0)
{
- assert(strlen(copy_id) < MAX_KEY_SIZE);
+ SVN_ERR_ASSERT(strlen(copy_id) < MAX_KEY_SIZE);
apr_cpystrn(max_copy_id, copy_id, MAX_KEY_SIZE);
}