Modified: subversion/trunk/subversion/libsvn_wc/status.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/status.c (original) +++ subversion/trunk/subversion/libsvn_wc/status.c Tue Jun 28 11:54:55 2011 @@ -821,7 +821,7 @@ send_status_structure(const struct walk_ if (statstruct && status_func) return svn_error_trace((*status_func)(status_baton, local_abspath, - statstruct, scratch_pool)); + statstruct, scratch_pool)); return SVN_NO_ERROR; } @@ -964,7 +964,7 @@ send_unversioned_item(const struct walk_ entry to the status func. */ if (no_ignore || (! is_ignored) || is_external) return svn_error_trace((*status_func)(status_baton, local_abspath, - status, scratch_pool)); + status, scratch_pool)); return SVN_NO_ERROR; } @@ -2454,10 +2454,10 @@ internal_status(svn_wc_status3_t **statu if (node_kind == svn_wc__db_kind_unknown) return svn_error_trace(assemble_unversioned(status, - db, local_abspath, - dirent->kind, - FALSE /* is_ignored */, - result_pool, scratch_pool)); + db, local_abspath, + dirent->kind, + FALSE /* is_ignored */, + result_pool, scratch_pool)); if (svn_dirent_is_root(local_abspath, strlen(local_abspath))) is_root = TRUE; @@ -2505,14 +2505,14 @@ internal_status(svn_wc_status3_t **statu } return svn_error_trace(assemble_status(status, db, local_abspath, - parent_repos_root_url, - parent_repos_relpath, - NULL, - dirent, - TRUE /* get_all */, - FALSE, - NULL /* repos_lock */, - result_pool, scratch_pool)); + parent_repos_root_url, + parent_repos_relpath, + NULL, + dirent, + TRUE /* get_all */, + FALSE, + NULL /* repos_lock */, + result_pool, scratch_pool)); } @@ -2579,7 +2579,7 @@ svn_wc_get_ignores2(apr_array_header_t * SVN_ERR(svn_wc_get_default_ignores(&default_ignores, config, scratch_pool)); return svn_error_trace(collect_ignore_patterns(patterns, wc_ctx->db, - local_abspath, - default_ignores, - result_pool, scratch_pool)); + local_abspath, + default_ignores, + result_pool, scratch_pool)); }
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jun 28 11:54:55 2011 @@ -1570,9 +1570,9 @@ check_tree_conflict(svn_wc_conflict_desc /* A conflict was detected. Append log commands to the log accumulator * to record it. */ return svn_error_trace(create_tree_conflict(pconflict, eb, local_abspath, - reason, action, their_node_kind, - their_relpath, - result_pool, scratch_pool)); + reason, action, their_node_kind, + their_relpath, + result_pool, scratch_pool)); } @@ -5047,9 +5047,9 @@ svn_wc__strictly_is_wc_root(svn_boolean_ apr_pool_t *scratch_pool) { return svn_error_trace(svn_wc__db_is_wcroot(wc_root, - wc_ctx->db, - local_abspath, - scratch_pool)); + wc_ctx->db, + local_abspath, + scratch_pool)); } @@ -5391,6 +5391,6 @@ svn_wc_add_repos_file4(svn_wc_context_t pool)); return svn_error_trace(svn_wc__wq_run(db, dir_abspath, - cancel_func, cancel_baton, - pool)); + cancel_func, cancel_baton, + pool)); } Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/upgrade.c (original) +++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jun 28 11:54:55 2011 @@ -648,9 +648,9 @@ ensure_repos_info(svn_wc_entry_t *entry, svn_dirent_local_style(local_abspath, scratch_pool)); return svn_error_trace((*repos_info_func)(&entry->repos, &entry->uuid, - repos_info_baton, - entry->url, - result_pool, scratch_pool)); + repos_info_baton, + entry->url, + result_pool, scratch_pool)); } Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun 28 11:54:55 2011 @@ -3176,7 +3176,7 @@ svn_wc__db_externals_gather_definitions( svn_pool_destroy(iterpool); return svn_error_trace(svn_error_compose_create(err, - svn_sqlite__reset(stmt))); + svn_sqlite__reset(stmt))); } /* Copy the ACTUAL data for SRC_RELPATH and tweak it to refer to DST_RELPATH. @@ -4650,8 +4650,8 @@ svn_wc__db_op_set_props(svn_wc__db_t *db spb.work_items = work_items; return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath, - set_props_txn, &spb, - scratch_pool)); + set_props_txn, &spb, + scratch_pool)); } @@ -5003,12 +5003,12 @@ 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_trace(with_finalization(wcroot, local_relpath, - set_changelist_txn, &scb, - do_changelist_notify, NULL, - cancel_func, cancel_baton, - notify_func, notify_baton, - STMT_FINALIZE_CHANGELIST, - scratch_pool)); + set_changelist_txn, &scb, + do_changelist_notify, NULL, + cancel_func, cancel_baton, + notify_func, notify_baton, + STMT_FINALIZE_CHANGELIST, + scratch_pool)); } @@ -6231,12 +6231,12 @@ 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_trace(with_finalization(wcroot, local_relpath, - op_delete_txn, &odb, - do_delete_notify, NULL, - cancel_func, cancel_baton, - notify_func, notify_baton, - STMT_FINALIZE_DELETE, - scratch_pool)); + op_delete_txn, &odb, + do_delete_notify, NULL, + cancel_func, cancel_baton, + notify_func, notify_baton, + STMT_FINALIZE_DELETE, + scratch_pool)); } @@ -7355,7 +7355,7 @@ svn_wc__db_read_url(const char **url, VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(read_url(url, wcroot, local_relpath, result_pool, - scratch_pool)); + scratch_pool)); } @@ -8625,7 +8625,7 @@ bump_node_revision(svn_wc__db_wcroot_t * revision != new_rev))) { return svn_error_trace(db_base_remove(NULL, wcroot, local_relpath, - scratch_pool)); + scratch_pool)); } if (new_repos_relpath != NULL && strcmp(repos_relpath, new_repos_relpath)) @@ -9211,8 +9211,8 @@ scan_addition(svn_wc__db_status_t *statu sab.result_pool = result_pool; return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath, - scan_addition_txn, - &sab, scratch_pool)); + scan_addition_txn, + &sab, scratch_pool)); } @@ -9486,8 +9486,8 @@ scan_deletion(const char **base_del_relp sd_baton.result_pool = result_pool; return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath, - scan_deletion_txn, &sd_baton, - scratch_pool)); + scan_deletion_txn, &sd_baton, + scratch_pool)); } @@ -9551,9 +9551,9 @@ svn_wc__db_upgrade_begin(svn_sqlite__db_ apr_pool_t *scratch_pool) { return svn_error_trace(create_db(sdb, repos_id, wc_id, dir_abspath, - repos_root_url, repos_uuid, - SDB_FILE, - result_pool, scratch_pool)); + repos_root_url, repos_uuid, + SDB_FILE, + result_pool, scratch_pool)); } @@ -9837,7 +9837,7 @@ svn_wc__db_wq_add(svn_wc__db_t *db, /* Add the work item(s) to the WORK_QUEUE. */ return svn_error_trace(add_work_items(wcroot->sdb, work_item, - scratch_pool)); + scratch_pool)); } /* Baton for wq_fetch_next */ @@ -10703,8 +10703,8 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *d baton.levels_to_lock = levels_to_lock; return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath, - wclock_obtain_cb, &baton, - scratch_pool)); + wclock_obtain_cb, &baton, + scratch_pool)); } @@ -11572,8 +11572,8 @@ svn_wc__db_min_max_revisions(svn_revnum_ VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(get_min_max_revisions(min_revision, max_revision, - wcroot, local_relpath, - committed, scratch_pool)); + wcroot, local_relpath, + committed, scratch_pool)); } @@ -11621,8 +11621,8 @@ svn_wc__db_is_sparse_checkout(svn_boolea VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(is_sparse_checkout_internal(is_sparse_checkout, - wcroot, local_relpath, - scratch_pool)); + wcroot, local_relpath, + scratch_pool)); } @@ -11732,8 +11732,8 @@ svn_wc__db_has_switched_subtrees(svn_boo VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(has_switched_subtrees(is_switched, wcroot, - local_relpath, trail_url, - scratch_pool)); + local_relpath, trail_url, + scratch_pool)); } svn_error_t * @@ -11918,8 +11918,8 @@ svn_wc__db_has_local_mods(svn_boolean_t VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(has_local_mods(is_modified, wcroot, local_relpath, - db, cancel_func, cancel_baton, - scratch_pool)); + db, cancel_func, cancel_baton, + scratch_pool)); } @@ -12029,8 +12029,8 @@ svn_wc__db_revision_status(svn_revnum_t VERIFY_USABLE_WCROOT(wcroot); return svn_error_trace(svn_wc__db_with_txn(wcroot, local_relpath, - revision_status_txn, &rsb, - scratch_pool)); + revision_status_txn, &rsb, + 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=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Tue Jun 28 11:54:55 2011 @@ -225,7 +225,7 @@ svn_wc__db_close(svn_wc__db_t *db) /* Run the cleanup for each WCROOT. */ return svn_error_trace(svn_wc__db_close_many_wcroots(roots, db->state_pool, - scratch_pool)); + scratch_pool)); } Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1140543&r1=1140542&r2=1140543&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/workqueue.c (original) +++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Jun 28 11:54:55 2011 @@ -87,9 +87,9 @@ get_and_record_fileinfo(svn_wc__db_t *db } return svn_error_trace(svn_wc__db_global_record_fileinfo( - db, local_abspath, - dirent->filesize, dirent->mtime, - scratch_pool)); + db, local_abspath, + dirent->filesize, dirent->mtime, + scratch_pool)); } @@ -828,7 +828,7 @@ run_file_remove(svn_wc__db_t *db, /* Remove the path, no worrying if it isn't there. */ return svn_error_trace(svn_io_remove_file2(local_abspath, TRUE, - scratch_pool)); + scratch_pool)); } @@ -1204,8 +1204,8 @@ run_record_fileinfo(svn_wc__db_t *db, return svn_error_trace(get_and_record_fileinfo(db, local_abspath, - TRUE /* ignore_enoent */, - scratch_pool)); + TRUE /* ignore_enoent */, + scratch_pool)); } @@ -1379,9 +1379,9 @@ run_set_property_conflict_marker(svn_wc_ return svn_error_trace( svn_wc__db_temp_op_set_property_conflict_marker_file(db, - local_abspath, - prej_abspath, - scratch_pool)); + local_abspath, + prej_abspath, + scratch_pool)); } svn_error_t *
