You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/06/24 10:09:12 UTC
svn commit: r1139195 [4/4] - in /subversion/trunk: subversion/include/
subversion/libsvn_client/ subversion/libsvn_diff/ subversion/libsvn_fs/
subversion/libsvn_fs_base/ subversion/libsvn_fs_base/bdb/
subversion/libsvn_fs_fs/ subversion/libsvn_ra/ subv...
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 24 08:09:09 2011
@@ -544,7 +544,7 @@ fetch_repos_info(const char **repos_root
if (repos_uuid)
*repos_uuid = svn_sqlite__column_text(stmt, 1, result_pool);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -634,7 +634,7 @@ create_repos_id(apr_int64_t *repos_id,
if (have_row)
{
*repos_id = svn_sqlite__column_int64(get_stmt, 0);
- return svn_error_return(svn_sqlite__reset(get_stmt));
+ return svn_error_trace(svn_sqlite__reset(get_stmt));
}
SVN_ERR(svn_sqlite__reset(get_stmt));
@@ -650,7 +650,7 @@ create_repos_id(apr_int64_t *repos_id,
SVN_ERR(svn_sqlite__get_statement(&insert_stmt, sdb,
STMT_INSERT_REPOSITORY));
SVN_ERR(svn_sqlite__bindf(insert_stmt, "ss", repos_root_url, repos_uuid));
- return svn_error_return(svn_sqlite__insert(repos_id, insert_stmt));
+ return svn_error_trace(svn_sqlite__insert(repos_id, insert_stmt));
}
@@ -1310,7 +1310,7 @@ add_single_work_item(svn_sqlite__db_t *s
serialized = svn_skel__unparse(work_item, scratch_pool);
SVN_ERR(svn_sqlite__get_statement(&stmt, sdb, STMT_INSERT_WORK_ITEM));
SVN_ERR(svn_sqlite__bind_blob(stmt, 1, serialized->data, serialized->len));
- return svn_error_return(svn_sqlite__insert(NULL, stmt));
+ return svn_error_trace(svn_sqlite__insert(NULL, stmt));
}
@@ -1334,7 +1334,7 @@ add_work_items(svn_sqlite__db_t *sdb,
/* Is the list a single work item? Or a list of work items? */
if (SVN_WC__SINGLE_WORK_ITEM(skel))
- return svn_error_return(add_single_work_item(sdb, skel, scratch_pool));
+ return svn_error_trace(add_single_work_item(sdb, skel, scratch_pool));
/* SKEL is a list-of-lists, aka list of work items. */
@@ -1363,7 +1363,7 @@ does_node_exist(svn_boolean_t *exists,
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step(exists, stmt));
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -1465,7 +1465,7 @@ svn_wc__db_init(svn_wc__db_t *db,
/* ### no children, conflicts, or work items to install in a txn... */
- return svn_error_return(insert_base_node(&ibb, wcroot, "", scratch_pool));
+ return svn_error_trace(insert_base_node(&ibb, wcroot, "", scratch_pool));
}
@@ -2198,7 +2198,7 @@ svn_wc__db_base_get_children_info(apr_ha
repos_id, result_pool);
if (err)
- return svn_error_return(
+ return svn_error_trace(
svn_error_compose_create(err,
svn_sqlite__reset(stmt)));
@@ -2320,7 +2320,7 @@ svn_wc__db_base_get_dav_cache(apr_hash_t
SVN_ERR(svn_sqlite__column_properties(props, stmt, 0, result_pool,
scratch_pool));
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -2500,7 +2500,7 @@ with_triggers(void *baton,
err2 = svn_sqlite__exec_statements(wcroot->sdb, b->drop_trigger);
- return svn_error_return(svn_error_compose_create(err1, err2));
+ return svn_error_trace(svn_error_compose_create(err1, err2));
}
@@ -2558,7 +2558,7 @@ with_finalization(svn_wc__db_wcroot_t *w
err2 = svn_sqlite__exec_statements(wcroot->sdb, finalize_stmt_idx);
- return svn_error_return(svn_error_compose_create(err1, err2));
+ return svn_error_trace(svn_error_compose_create(err1, err2));
}
@@ -2600,7 +2600,7 @@ insert_external_node(void *baton,
if (err)
{
if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
}
@@ -2762,7 +2762,7 @@ svn_wc__db_external_add_file(svn_wc__db_
ieb.work_items = work_items;
- return svn_error_return(
+ return svn_error_trace(
svn_wc__db_with_txn(wcroot, local_relpath, insert_external_node,
&ieb, scratch_pool));
}
@@ -2846,7 +2846,7 @@ svn_wc__db_external_add_symlink(svn_wc__
ieb.work_items = work_items;
- return svn_error_return(
+ return svn_error_trace(
svn_wc__db_with_txn(wcroot, local_relpath, insert_external_node,
&ieb, scratch_pool));
}
@@ -2901,7 +2901,7 @@ svn_wc__db_external_add_dir(svn_wc__db_t
ieb.work_items = work_items;
- return svn_error_return(
+ return svn_error_trace(
svn_wc__db_with_txn(wcroot, local_relpath, insert_external_node,
&ieb, scratch_pool));
}
@@ -3045,7 +3045,7 @@ svn_wc__db_external_read(svn_wc__db_stat
scratch_pool));
}
- return svn_error_return(
+ return svn_error_trace(
svn_error_compose_create(err, svn_sqlite__reset(stmt)));
}
@@ -3092,7 +3092,7 @@ svn_wc__db_externals_defined_below(apr_h
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
svn_error_t *
@@ -3175,7 +3175,7 @@ svn_wc__db_externals_gather_definitions(
svn_pool_destroy(iterpool);
- return svn_error_return(svn_error_compose_create(err,
+ return svn_error_trace(svn_error_compose_create(err,
svn_sqlite__reset(stmt)));
}
@@ -3487,7 +3487,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
svn_error_clear(err);
else
- return svn_error_return(err);
+ return svn_error_trace(err);
}
else if (dst_status == svn_wc__db_status_deleted)
{
@@ -3639,7 +3639,7 @@ op_copy_txn(void * baton, svn_sqlite__db
/* Source and destination databases differ; so also start a lock
in the destination database, by calling ourself in a lock. */
- return svn_error_return(
+ return svn_error_trace(
svn_sqlite__with_lock(ocb->dst_wcroot->sdb,
op_copy_txn, ocb, scratch_pool));
}
@@ -3725,7 +3725,7 @@ db_op_copy_shadowed_layer(svn_wc__db_wcr
if (err)
{
if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
return SVN_NO_ERROR; /* There is no shadowed node at src_op_depth */
@@ -3914,7 +3914,7 @@ op_copy_shadowed_layer_txn(void * baton,
/* Source and destination databases differ; so also start a lock
in the destination database, by calling ourself in a lock. */
- return svn_error_return(
+ return svn_error_trace(
svn_sqlite__with_lock(ocb->dst_wcroot->sdb,
op_copy_shadowed_layer_txn,
ocb, scratch_pool));
@@ -4571,7 +4571,7 @@ set_actual_props(apr_int64_t wc_id,
svn_relpath_dirname(local_relpath,
scratch_pool)));
SVN_ERR(svn_sqlite__bind_properties(stmt, 4, props, scratch_pool));
- return svn_error_return(svn_sqlite__step_done(stmt));
+ return svn_error_trace(svn_sqlite__step_done(stmt));
}
@@ -4649,7 +4649,7 @@ svn_wc__db_op_set_props(svn_wc__db_t *db
spb.conflict = conflict;
spb.work_items = work_items;
- return svn_error_return(svn_wc__db_with_txn(wcroot, local_relpath,
+ return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
set_props_txn, &spb,
scratch_pool));
}
@@ -4968,7 +4968,7 @@ do_changelist_notify(void *baton,
}
svn_pool_destroy(iterpool);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -5002,7 +5002,7 @@ svn_wc__db_op_set_changelist(svn_wc__db_
/* Perform the set-changelist operation (transactionally), perform any
notifications necessary, and then clean out our temporary tables. */
- return svn_error_return(with_finalization(wcroot, local_relpath,
+ return svn_error_trace(with_finalization(wcroot, local_relpath,
set_changelist_txn, &scb,
do_changelist_notify, NULL,
cancel_func, cancel_baton,
@@ -5530,7 +5530,7 @@ svn_wc__db_revert_list_notify(svn_wc_not
SVN_ERR(svn_sqlite__bindf(stmt, "ss", local_relpath, like_arg));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (!have_row)
- return svn_error_return(svn_sqlite__reset(stmt)); /* optimise for no row */
+ return svn_error_trace(svn_sqlite__reset(stmt)); /* optimise for no row */
while (have_row)
{
const char *notify_relpath = svn_sqlite__column_text(stmt, 0, NULL);
@@ -5679,7 +5679,7 @@ read_tree_conflict(const svn_wc_conflict
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (!have_row)
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
conflict_data = svn_sqlite__column_text(stmt, 0, NULL);
skel = svn_skel__parse(conflict_data, strlen(conflict_data), scratch_pool);
@@ -6199,7 +6199,7 @@ do_delete_notify(void *baton,
}
svn_pool_destroy(iterpool);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -6230,7 +6230,7 @@ svn_wc__db_op_delete(svn_wc__db_t *db,
/* Perform the deletion operation (transactionally), perform any
notifications necessary, and then clean out our temporary tables. */
- return svn_error_return(with_finalization(wcroot, local_relpath,
+ return svn_error_trace(with_finalization(wcroot, local_relpath,
op_delete_txn, &odb,
do_delete_notify, NULL,
cancel_func, cancel_baton,
@@ -7068,7 +7068,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
*had_props = SQLITE_PROPERTIES_AVAILABLE(stmt, 14);
}
- return svn_error_return(
+ return svn_error_trace(
svn_error_compose_create(err,
svn_sqlite__reset(stmt)));
}
@@ -7354,7 +7354,7 @@ svn_wc__db_read_url(const char **url,
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(read_url(url, wcroot, local_relpath, result_pool,
+ return svn_error_trace(read_url(url, wcroot, local_relpath, result_pool,
scratch_pool));
}
@@ -7652,7 +7652,7 @@ db_read_pristine_props(apr_hash_t **prop
}
*props = NULL;
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -7743,13 +7743,13 @@ check_replace_txn(void *baton,
status = svn_sqlite__column_token(stmt, 3, presence_map);
if (status != svn_wc__db_status_normal)
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
SVN_ERR(svn_sqlite__step(&have_row, stmt));
if (!have_row)
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
replaced_status = svn_sqlite__column_token(stmt, 3, presence_map);
@@ -8077,7 +8077,7 @@ determine_repos_info(apr_int64_t *repos_
*repos_id = svn_sqlite__column_int64(stmt, 0);
*repos_relpath = svn_sqlite__column_text(stmt, 1, result_pool);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
SVN_ERR(svn_sqlite__reset(stmt));
@@ -8624,7 +8624,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
|| (status == svn_wc__db_status_server_excluded &&
revision != new_rev)))
{
- return svn_error_return(db_base_remove(NULL, wcroot, local_relpath,
+ return svn_error_trace(db_base_remove(NULL, wcroot, local_relpath,
scratch_pool));
}
@@ -9210,7 +9210,7 @@ scan_addition(svn_wc__db_status_t *statu
sab.original_revision = original_revision;
sab.result_pool = result_pool;
- return svn_error_return(svn_wc__db_with_txn(wcroot, local_relpath,
+ return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
scan_addition_txn,
&sab, scratch_pool));
}
@@ -9485,7 +9485,7 @@ scan_deletion(const char **base_del_relp
sd_baton.work_del_relpath = work_del_relpath;
sd_baton.result_pool = result_pool;
- return svn_error_return(svn_wc__db_with_txn(wcroot, local_relpath,
+ return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
scan_deletion_txn, &sd_baton,
scratch_pool));
}
@@ -9550,7 +9550,7 @@ svn_wc__db_upgrade_begin(svn_sqlite__db_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- return svn_error_return(create_db(sdb, repos_id, wc_id, dir_abspath,
+ return svn_error_trace(create_db(sdb, repos_id, wc_id, dir_abspath,
repos_root_url, repos_uuid,
SDB_FILE,
result_pool, scratch_pool));
@@ -9812,7 +9812,7 @@ svn_wc__db_upgrade_get_repos_id(apr_int6
repos_root_url);
*repos_id = svn_sqlite__column_int64(stmt, 0);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -9836,7 +9836,7 @@ svn_wc__db_wq_add(svn_wc__db_t *db,
VERIFY_USABLE_WCROOT(wcroot);
/* Add the work item(s) to the WORK_QUEUE. */
- return svn_error_return(add_work_items(wcroot->sdb, work_item,
+ return svn_error_trace(add_work_items(wcroot->sdb, work_item,
scratch_pool));
}
@@ -9888,7 +9888,7 @@ wq_fetch_next(void *baton,
fnb->work_item = svn_skel__parse(val, len, fnb->result_pool);
}
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
svn_error_t *
@@ -9947,7 +9947,7 @@ svn_wc__db_temp_get_format(int *format,
if (err)
{
if (err && err->apr_err != SVN_ERR_WC_NOT_WORKING_COPY)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
/* Remap the returned error. */
@@ -10374,7 +10374,7 @@ svn_wc__db_read_kind(svn_wc__db_kind_t *
*kind = svn_sqlite__column_token(stmt_info, 4, kind_map);
- return svn_error_return(svn_sqlite__reset(stmt_info));
+ return svn_error_trace(svn_sqlite__reset(stmt_info));
}
@@ -10702,7 +10702,7 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *d
baton.steal_lock = steal_lock;
baton.levels_to_lock = levels_to_lock;
- return svn_error_return(svn_wc__db_with_txn(wcroot, local_relpath,
+ return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
wclock_obtain_cb, &baton,
scratch_pool));
}
@@ -10767,7 +10767,7 @@ is_wclocked(void *baton,
*locked = FALSE;
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -11313,7 +11313,7 @@ svn_wc__db_temp_op_set_text_conflict_mar
new_relpath,
wrk_relpath));
- return svn_error_return(svn_sqlite__step_done(stmt));
+ return svn_error_trace(svn_sqlite__step_done(stmt));
}
@@ -11377,7 +11377,7 @@ svn_wc__db_temp_op_set_property_conflict
local_relpath,
prej_relpath));
- return svn_error_return(svn_sqlite__step_done(stmt));
+ return svn_error_trace(svn_sqlite__step_done(stmt));
}
svn_error_t *
@@ -11497,7 +11497,7 @@ svn_wc__db_get_not_present_descendants(c
else
*descendants = apr_array_make(result_pool, 0, sizeof(const char*));
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -11571,7 +11571,7 @@ svn_wc__db_min_max_revisions(svn_revnum_
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(get_min_max_revisions(min_revision, max_revision,
+ return svn_error_trace(get_min_max_revisions(min_revision, max_revision,
wcroot, local_relpath,
committed, scratch_pool));
}
@@ -11620,7 +11620,7 @@ svn_wc__db_is_sparse_checkout(svn_boolea
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(is_sparse_checkout_internal(is_sparse_checkout,
+ return svn_error_trace(is_sparse_checkout_internal(is_sparse_checkout,
wcroot, local_relpath,
scratch_pool));
}
@@ -11731,7 +11731,7 @@ svn_wc__db_has_switched_subtrees(svn_boo
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(has_switched_subtrees(is_switched, wcroot,
+ return svn_error_trace(has_switched_subtrees(is_switched, wcroot,
local_relpath, trail_url,
scratch_pool));
}
@@ -11917,7 +11917,7 @@ svn_wc__db_has_local_mods(svn_boolean_t
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(has_local_mods(is_modified, wcroot, local_relpath,
+ return svn_error_trace(has_local_mods(is_modified, wcroot, local_relpath,
db, cancel_func, cancel_baton,
scratch_pool));
}
@@ -11983,7 +11983,7 @@ revision_status_txn(void *baton,
if (err)
{
if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err); /* No Base node, but no fatal error */
*rsb->is_switched = FALSE;
@@ -12028,7 +12028,7 @@ svn_wc__db_revision_status(svn_revnum_t
scratch_pool, scratch_pool));
VERIFY_USABLE_WCROOT(wcroot);
- return svn_error_return(svn_wc__db_with_txn(wcroot, local_relpath,
+ return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath,
revision_status_txn, &rsb,
scratch_pool));
}
@@ -12078,7 +12078,7 @@ svn_wc__db_base_get_lock_tokens_recursiv
if (err)
{
- return svn_error_return(
+ return svn_error_trace(
svn_error_compose_create(err,
svn_sqlite__reset(stmt)));
}
@@ -12177,7 +12177,7 @@ verify_wcroot(svn_wc__db_wcroot_t *wcroo
}
svn_pool_destroy(iterpool);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Fri Jun 24 08:09:09 2011
@@ -364,7 +364,7 @@ pristine_install_txn(void *baton,
if (err2)
/* Creating directory didn't work: Return all errors */
- return svn_error_return(svn_error_compose_create(err, err2));
+ return svn_error_trace(svn_error_compose_create(err, err2));
else
/* We could create a directory: retry install */
svn_error_clear(err);
@@ -473,7 +473,7 @@ svn_wc__db_pristine_get_md5(const svn_ch
SVN_ERR(svn_sqlite__column_checksum(md5_checksum, stmt, 0, result_pool));
SVN_ERR_ASSERT((*md5_checksum)->kind == svn_checksum_md5);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -512,7 +512,7 @@ svn_wc__db_pristine_get_sha1(const svn_c
SVN_ERR(svn_sqlite__column_checksum(sha1_checksum, stmt, 0, result_pool));
SVN_ERR_ASSERT((*sha1_checksum)->kind == svn_checksum_sha1);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_util.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_util.c Fri Jun 24 08:09:09 2011
@@ -71,7 +71,7 @@ svn_wc__db_util_fetch_wc_id(apr_int64_t
SVN_ERR_ASSERT(!svn_sqlite__column_is_null(stmt, 0));
*wc_id = svn_sqlite__column_int64(stmt, 0);
- return svn_error_return(svn_sqlite__reset(stmt));
+ return svn_error_trace(svn_sqlite__reset(stmt));
}
@@ -166,7 +166,7 @@ run_txn(void *baton, svn_sqlite__db_t *d
{
struct txn_baton_t *tb = baton;
- return svn_error_return(
+ return svn_error_trace(
tb->cb_func(tb->cb_baton, tb->wcroot, tb->local_relpath, scratch_pool));
}
@@ -183,6 +183,6 @@ svn_wc__db_with_txn(svn_wc__db_wcroot_t
{
struct txn_baton_t tb = { wcroot, local_relpath, cb_func, cb_baton };
- return svn_error_return(
+ return svn_error_trace(
svn_sqlite__with_lock(wcroot->sdb, run_txn, &tb, scratch_pool));
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Fri Jun 24 08:09:09 2011
@@ -224,7 +224,7 @@ svn_wc__db_close(svn_wc__db_t *db)
}
/* Run the cleanup for each WCROOT. */
- return svn_error_return(svn_wc__db_close_many_wcroots(roots, db->state_pool,
+ return svn_error_trace(svn_wc__db_close_many_wcroots(roots, db->state_pool,
scratch_pool));
}
@@ -285,7 +285,7 @@ svn_wc__db_pdh_create_wcroot(svn_wc__db_
err = svn_error_quick_wrap(err, _("Cleanup with an older 1.7 "
"client before upgrading with "
"this client"));
- return svn_error_return(err);
+ return svn_error_trace(err);
}
}
@@ -481,7 +481,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
}
if (err->apr_err != SVN_ERR_SQLITE_ERROR
&& !APR_STATUS_IS_ENOENT(err->apr_err))
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
/* If we have not moved upwards, then check for a wc-1 working copy.
@@ -544,7 +544,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
_("Missing a row in WCROOT for '%s'."),
svn_dirent_local_style(original_abspath,
scratch_pool)));
- return svn_error_return(err);
+ return svn_error_trace(err);
}
/* WCROOT.local_abspath may be NULL when the database is stored
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Jun 24 08:09:09 2011
@@ -86,7 +86,7 @@ get_and_record_fileinfo(svn_wc__db_t *db
return SVN_NO_ERROR;
}
- return svn_error_return(svn_wc__db_global_record_fileinfo(
+ return svn_error_trace(svn_wc__db_global_record_fileinfo(
db, local_abspath,
dirent->filesize, dirent->mtime,
scratch_pool));
@@ -515,7 +515,7 @@ run_file_commit(svn_wc__db_t *db,
/* We don't both parsing the other two values in the skel. */
- return svn_error_return(
+ return svn_error_trace(
process_commit_file_install(db, local_abspath,
cancel_func, cancel_baton,
scratch_pool));
@@ -827,7 +827,7 @@ run_file_remove(svn_wc__db_t *db,
local_relpath, scratch_pool, scratch_pool));
/* Remove the path, no worrying if it isn't there. */
- return svn_error_return(svn_io_remove_file2(local_abspath, TRUE,
+ return svn_error_trace(svn_io_remove_file2(local_abspath, TRUE,
scratch_pool));
}
@@ -1054,7 +1054,7 @@ run_sync_file_flags(svn_wc__db_t *db,
SVN_ERR(svn_wc__db_from_relpath(&local_abspath, db, wri_abspath,
local_relpath, scratch_pool, scratch_pool));
- return svn_error_return(svn_wc__sync_flags_with_props(NULL, db,
+ return svn_error_trace(svn_wc__sync_flags_with_props(NULL, db,
local_abspath, scratch_pool));
}
@@ -1203,7 +1203,7 @@ run_record_fileinfo(svn_wc__db_t *db,
}
- return svn_error_return(get_and_record_fileinfo(db, local_abspath,
+ return svn_error_trace(get_and_record_fileinfo(db, local_abspath,
TRUE /* ignore_enoent */,
scratch_pool));
}
@@ -1290,7 +1290,7 @@ run_set_text_conflict_markers(svn_wc__db
scratch_pool, scratch_pool));
}
- return svn_error_return(
+ return svn_error_trace(
svn_wc__db_temp_op_set_text_conflict_marker_files(db,
local_abspath,
old_abspath,
@@ -1377,7 +1377,7 @@ run_set_property_conflict_marker(svn_wc_
local_relpath,
scratch_pool, scratch_pool));
- return svn_error_return(
+ return svn_error_trace(
svn_wc__db_temp_op_set_property_conflict_marker_file(db,
local_abspath,
prej_abspath,
Modified: subversion/trunk/subversion/svn/blame-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/blame-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/blame-cmd.c (original)
+++ subversion/trunk/subversion/svn/blame-cmd.c Fri Jun 24 08:09:09 2011
@@ -389,7 +389,7 @@ svn_cl__blame(apr_getopt_t *os,
}
else
{
- return svn_error_return(err);
+ return svn_error_trace(err);
}
}
else if (opt_state->xml)
Modified: subversion/trunk/subversion/svn/commit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/commit-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/commit-cmd.c (original)
+++ subversion/trunk/subversion/svn/commit-cmd.c Fri Jun 24 08:09:09 2011
@@ -117,7 +117,7 @@ svn_cl__commit(apr_getopt_t *os,
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
if (svn_path_is_url(target))
- return svn_error_return(
+ return svn_error_trace(
svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("'%s' is a URL, but URLs cannot be "
"commit targets"), target));
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Jun 24 08:09:09 2011
@@ -200,7 +200,7 @@ open_editor(svn_boolean_t *performed_edi
svn_error_clear(err);
}
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
else
*performed_edit = TRUE;
}
@@ -247,7 +247,7 @@ launch_resolver(svn_boolean_t *performed
svn_error_clear(err);
}
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
else if (performed_edit)
*performed_edit = TRUE;
@@ -328,7 +328,7 @@ svn_cl__conflict_handler(svn_wc_conflict
b->external_failed = TRUE;
}
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
(*result)->choice = svn_wc_conflict_choose_merged;
return SVN_NO_ERROR;
}
@@ -361,7 +361,7 @@ svn_cl__conflict_handler(svn_wc_conflict
_("No merge tool found;"
" leaving all conflicts.")));
b->external_failed = TRUE;
- return svn_error_return(err);
+ return svn_error_trace(err);
}
else if (err && err->apr_err == SVN_ERR_EXTERNAL_PROGRAM)
{
@@ -370,10 +370,10 @@ svn_cl__conflict_handler(svn_wc_conflict
_("Error running merge tool;"
" leaving all conflicts.")));
b->external_failed = TRUE;
- return svn_error_return(err);
+ return svn_error_trace(err);
}
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
if (remains_in_conflict)
(*result)->choice = svn_wc_conflict_choose_postpone;
Modified: subversion/trunk/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/copy-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/copy-cmd.c (original)
+++ subversion/trunk/subversion/svn/copy-cmd.c Fri Jun 24 08:09:09 2011
@@ -131,7 +131,7 @@ svn_cl__copy(apr_getopt_t *os,
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/delete-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/delete-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/delete-cmd.c (original)
+++ subversion/trunk/subversion/svn/delete-cmd.c Fri Jun 24 08:09:09 2011
@@ -87,7 +87,7 @@ svn_cl__delete(apr_getopt_t *os,
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/export-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/export-cmd.c (original)
+++ subversion/trunk/subversion/svn/export-cmd.c Fri Jun 24 08:09:09 2011
@@ -120,5 +120,5 @@ svn_cl__export(apr_getopt_t *os,
_("Failure occurred processing one or more "
"externals definitions"));
- return svn_error_return(err);
+ return svn_error_trace(err);
}
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Fri Jun 24 08:09:09 2011
@@ -608,7 +608,7 @@ svn_cl__info(apr_getopt_t *os,
}
else
{
- return svn_error_return(err);
+ return svn_error_trace(err);
}
svn_error_clear(err);
Modified: subversion/trunk/subversion/svn/list-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/list-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/list-cmd.c (original)
+++ subversion/trunk/subversion/svn/list-cmd.c Fri Jun 24 08:09:09 2011
@@ -298,7 +298,7 @@ svn_cl__list(apr_getopt_t *os,
err->apr_err == SVN_ERR_FS_NOT_FOUND)
svn_handle_warning2(stderr, err, "svn: ");
else
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
err = NULL;
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Fri Jun 24 08:09:09 2011
@@ -370,13 +370,13 @@ log_entry_receiver(void *baton,
svn_error_clear(err);
break;
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
}
svn_pool_destroy(iterpool);
}
else
- return svn_error_return(err);
+ return svn_error_trace(err);
}
SVN_ERR(svn_cmdline_printf(pool, _("\n")));
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Fri Jun 24 08:09:09 2011
@@ -342,7 +342,7 @@ svn_cl__merge(apr_getopt_t *os,
else
{
if (svn_path_is_url(sourcepath1) != svn_path_is_url(sourcepath2))
- return svn_error_return(svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR,
+ return svn_error_trace(svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR,
NULL,
_("Merge sources must both be "
"either paths or URLs")));
@@ -380,5 +380,5 @@ svn_cl__merge(apr_getopt_t *os,
}
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
Modified: subversion/trunk/subversion/svn/mkdir-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mkdir-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mkdir-cmd.c (original)
+++ subversion/trunk/subversion/svn/mkdir-cmd.c Fri Jun 24 08:09:09 2011
@@ -96,7 +96,7 @@ svn_cl__mkdir(apr_getopt_t *os,
return svn_error_quick_wrap
(err, _("Try 'svn mkdir --parents' instead?"));
else
- return svn_error_return(err);
+ return svn_error_trace(err);
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svn/move-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/move-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/move-cmd.c (original)
+++ subversion/trunk/subversion/svn/move-cmd.c Fri Jun 24 08:09:09 2011
@@ -94,7 +94,7 @@ svn_cl__move(apr_getopt_t *os,
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propedit-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propedit-cmd.c (original)
+++ subversion/trunk/subversion/svn/propedit-cmd.c Fri Jun 24 08:09:09 2011
@@ -326,7 +326,7 @@ svn_cl__propedit(apr_getopt_t *os,
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3,
err, pool));
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
/* Print a message if we successfully committed or if it
was just a wc propset (but not if the user aborted an URL
Modified: subversion/trunk/subversion/svn/revert-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/revert-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/revert-cmd.c (original)
+++ subversion/trunk/subversion/svn/revert-cmd.c Fri Jun 24 08:09:09 2011
@@ -87,5 +87,5 @@ svn_cl__revert(apr_getopt_t *os,
(err, _("Try 'svn revert --depth infinity' instead?"));
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
Modified: subversion/trunk/subversion/svn/unlock-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/unlock-cmd.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/unlock-cmd.c (original)
+++ subversion/trunk/subversion/svn/unlock-cmd.c Fri Jun 24 08:09:09 2011
@@ -63,6 +63,6 @@ svn_cl__unlock(apr_getopt_t *os,
SVN_ERR(svn_cl__assert_homogeneous_target_type(targets));
- return svn_error_return(
+ return svn_error_trace(
svn_client_unlock(targets, opt_state->force, ctx, scratch_pool));
}
Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Fri Jun 24 08:09:09 2011
@@ -529,7 +529,7 @@ svn_cl__edit_string_externally(svn_strin
stderr, TRUE /* fatal */, "svn: ");
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
@@ -820,7 +820,7 @@ svn_cl__get_log_message(const char **log
(err, _("Could not use external editor to fetch log message; "
"consider setting the $SVN_EDITOR environment variable "
"or using the --message (-m) or --file (-F) options"));
- return svn_error_return(err);
+ return svn_error_trace(err);
}
if (msg_string)
@@ -910,7 +910,7 @@ svn_cl__may_need_force(svn_error_t *err)
"may be lost)"));
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
@@ -967,7 +967,7 @@ svn_cl__try(svn_error_t *err,
*success = TRUE;
}
- return svn_error_return(err);
+ return svn_error_trace(err);
}
@@ -1160,7 +1160,7 @@ svn_cl__args_to_target_array_print_reser
svn_error_clear(err);
}
else
- return svn_error_return(err);
+ return svn_error_trace(err);
}
return SVN_NO_ERROR;
}
@@ -1214,7 +1214,7 @@ svn_cl__changelist_paths(apr_array_heade
svn_pool_destroy(iterpool);
SVN_ERR(svn_hash_from_cstring_keys(&paths_hash, found, result_pool));
- return svn_error_return(svn_hash_keys(paths, paths_hash, result_pool));
+ return svn_error_trace(svn_hash_keys(paths, paths_hash, result_pool));
}
svn_cl__show_revs_t
@@ -1246,7 +1246,7 @@ svn_cl__time_cstring_to_human_cstring(co
return SVN_NO_ERROR;
}
else if (err)
- return svn_error_return(err);
+ return svn_error_trace(err);
*human_cstring = svn_time_to_human_cstring(when, pool);
Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Fri Jun 24 08:09:09 2011
@@ -1327,7 +1327,7 @@ subcommand_pack(apr_getopt_t *os, void *
if (! opt_state->quiet)
progress_stream = recode_stream_create(stderr, pool);
- return svn_error_return(
+ return svn_error_trace(
svn_repos_fs_pack2(repos, !opt_state->quiet ? repos_notify_handler : NULL,
progress_stream, check_cancel, NULL, pool));
}
Modified: subversion/trunk/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/main.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/main.c (original)
+++ subversion/trunk/subversion/svnsync/main.c Fri Jun 24 08:09:09 2011
@@ -766,7 +766,7 @@ do_initialize(svn_ra_session_t *to_sessi
SVN_RA_CAPABILITY_PARTIAL_REPLAY,
pool);
if (err && err->apr_err != SVN_ERR_UNKNOWN_CAPABILITY)
- return svn_error_return(err);
+ return svn_error_trace(err);
if (err || !server_supports_partial_replay)
return svn_error_create(SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED, err,
Modified: subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c (original)
+++ subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c Fri Jun 24 08:09:09 2011
@@ -178,7 +178,7 @@ change_rev_prop(const char *url,
"An error was expected but not seen");
else
/* A real (non-SVN_ERR_FS_PROP_BASEVALUE_MISMATCH) error. */
- return svn_error_return(err);
+ return svn_error_trace(err);
}
else
/* Running under --server-minor-version? */
Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries-dump.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Fri Jun 24 08:09:09 2011
@@ -248,7 +248,7 @@ directory_dump(const char *path,
SVN_ERR(directory_dump_old(&bt, dir_abspath, scratch_pool));
}
- return svn_error_return(svn_wc_context_destroy(bt.wc_ctx));
+ return svn_error_trace(svn_wc_context_destroy(bt.wc_ctx));
}
int
Modified: subversion/trunk/subversion/tests/libsvn_subr/error-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/error-test.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/error-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/error-test.c Fri Jun 24 08:09:09 2011
@@ -90,7 +90,7 @@ test_error_purge_tracing(apr_pool_t *poo
"SVN_NO_ERROR after being passed a "
"SVN_NO_ERROR.");
- err = svn_error_return(svn_error_create(SVN_ERR_BASE, NULL, "root error"));
+ err = svn_error_trace(svn_error_create(SVN_ERR_BASE, NULL, "root error"));
#ifdef SVN_ERR__TRACING
if (! svn_error__is_tracing_link(err))
{
@@ -98,7 +98,7 @@ test_error_purge_tracing(apr_pool_t *poo
"The top error is not a tracing link:");
}
#endif
- err = svn_error_return(svn_error_create(SVN_ERR_BASE, err, "other error"));
+ err = svn_error_trace(svn_error_create(SVN_ERR_BASE, err, "other error"));
#ifdef SVN_ERR__TRACING
if (! svn_error__is_tracing_link(err))
{
@@ -126,7 +126,7 @@ test_error_purge_tracing(apr_pool_t *poo
/* For this test, use a random error status. */
err = svn_error_create(SVN_ERR_BAD_UUID, NULL, SVN_ERR__TRACED);
- err = svn_error_return(err);
+ err = svn_error_trace(err);
/* Register a malfunction handler that doesn't call abort() to
check that a new error chain with an assertion error is
Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Fri Jun 24 08:09:09 2011
@@ -569,14 +569,14 @@ test_access_baton_like_locking(apr_pool_
err = svn_wc__db_wclock_obtain(wc_ctx2->db, D3, 0, FALSE, pool);
if (err && err->apr_err != SVN_ERR_WC_LOCKED)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
SVN_TEST_ASSERT(err != NULL); /* Can't lock, as it is still locked */
err = svn_wc__db_wclock_release(wc_ctx2->db, D4, pool);
if (err && err->apr_err != SVN_ERR_WC_NOT_LOCKED)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
SVN_TEST_ASSERT(err != NULL); /* Can't unlock, as it is not ours */
@@ -590,7 +590,7 @@ test_access_baton_like_locking(apr_pool_
err = svn_wc__db_wclock_release(wc_ctx2->db, D4, pool);
if (err && err->apr_err != SVN_ERR_WC_NOT_LOCKED)
- return svn_error_return(err);
+ return svn_error_trace(err);
svn_error_clear(err);
SVN_TEST_ASSERT(err != NULL); /* Can't unlock a not locked path */
Modified: subversion/trunk/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-rep-sharing-stats.c?rev=1139195&r1=1139194&r2=1139195&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/trunk/tools/server-side/svn-rep-sharing-stats.c Fri Jun 24 08:09:09 2011
@@ -93,7 +93,7 @@ check_lib_versions(void)
};
SVN_VERSION_DEFINE(my_version);
- return svn_error_return(svn_ver_check_list(&my_version, checklist));
+ return svn_error_trace(svn_ver_check_list(&my_version, checklist));
}