Author: julianfoad
Date: Wed Jun 20 13:06:16 2012
New Revision: 1352080
URL: http://svn.apache.org/viewvc?rev=1352080&view=rev
Log:
Add a blank line between declarations and statements where r1352068 didn't.
* subversion/libsvn_client/deprecated.c,
subversion/libsvn_client/info.c,
subversion/libsvn_client/merge.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_wc/adm_ops.c,
subversion/libsvn_wc/props.c,
subversion/libsvn_wc/upgrade.c,
subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/wc_db_util.c,
subversion/tests/libsvn_subr/named_atomic-test.c,
subversion/tests/libsvn_wc/op-depth-test.c:
Add blank lines.
Modified:
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/info.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db_util.c
subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Wed Jun 20 13:06:16
2012
@@ -1644,6 +1644,7 @@ svn_client_propset3(svn_commit_info_t **
if (svn_path_is_url(target))
{
struct capture_baton_t cb;
+
cb.info = commit_info_p;
cb.pool = pool;
@@ -1959,6 +1960,7 @@ svn_client_status4(svn_revnum_t *result_
apr_pool_t *pool)
{
struct status4_wrapper_baton swb;
+
swb.wc_ctx = ctx->wc_ctx;
swb.old_func = status_func;
swb.old_baton = status_baton;
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Wed Jun 20 13:06:16 2012
@@ -349,6 +349,7 @@ svn_client_info3(const char *abspath_or_
{
/* Do all digging in the working copy. */
wc_info_receiver_baton_t b;
+
b.client_receiver_func = receiver;
b.client_receiver_baton = receiver_baton;
return svn_error_trace(
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jun 20 13:06:16 2012
@@ -9644,6 +9644,7 @@ merge_locked(const char *source1,
else
{
merge_source_t source;
+
source.loc1 = source1_loc;
source.loc2 = source2_loc;
source.ancestral = FALSE;
@@ -9679,6 +9680,7 @@ merge_locked(const char *source1,
else
{
merge_source_t source;
+
source.loc1 = source1_loc;
source.loc2 = source2_loc;
source.ancestral = FALSE;
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=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Jun 20 13:06:16 2012
@@ -3524,6 +3524,7 @@ set_cached_window(svn_txdelta_window_t *
{
/* store the window and the first offset _past_ it */
svn_fs_fs__txdelta_cached_window_t cached_window;
+
cached_window.window = window;
cached_window.end_offset = rs->off;
@@ -5557,6 +5558,7 @@ svn_fs_fs__set_entry(svn_fs_t *fs,
const char *key =
svn_fs_fs__id_unparse(parent_noderev->id, subpool)->data;
replace_baton_t baton;
+
baton.name = name;
baton.new_entry = NULL;
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Jun 20 13:06:16 2012
@@ -2697,6 +2697,7 @@ svn_wc_get_changelists(svn_wc_context_t
apr_pool_t *scratch_pool)
{
struct get_cl_fn_baton gnb;
+
gnb.db = wc_ctx->db;
gnb.clhash = NULL;
gnb.callback_func = callback_func;
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Wed Jun 20 13:06:16 2012
@@ -1853,6 +1853,7 @@ svn_wc__prop_list_recursive(svn_wc_conte
svn_wc__proplist_receiver_t receiver = receiver_func;
void *baton = receiver_baton;
struct propname_filter_baton_t pfb;
+
pfb.receiver_func = receiver_func;
pfb.receiver_baton = receiver_baton;
pfb.propname = propname;
@@ -2492,6 +2493,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
else
{
struct propset_walk_baton wb;
+
wb.propname = name;
wb.propval = value;
wb.db = wc_ctx->db;
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed Jun 20 13:06:16 2012
@@ -1546,6 +1546,7 @@ svn_wc__upgrade_sdb(int *result_format,
apr_pool_t *scratch_pool)
{
struct bump_baton bb;
+
bb.wcroot_abspath = wcroot_abspath;
if (start_format < SVN_WC__WC_NG_VERSION /* 12 */)
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Jun 20 13:06:16 2012
@@ -5142,6 +5142,7 @@ svn_wc__db_op_set_changelist(svn_wc__db_
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
struct set_changelist_baton_t scb;
+
scb.new_changelist = new_changelist;
scb.changelist_filter = changelist_filter;
scb.depth = depth;
@@ -5783,6 +5784,7 @@ svn_wc__db_revert_list_read(svn_boolean_
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
struct revert_list_read_baton b;
+
b.reverted = reverted;
b.conflict_old = conflict_old;
b.conflict_new = conflict_new;
@@ -5862,6 +5864,7 @@ svn_wc__db_revert_list_read_copied_child
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
struct revert_list_read_copied_children_baton b;
+
b.children = children;
b.result_pool = result_pool;
@@ -8142,6 +8145,7 @@ read_url(const char **url,
apr_pool_t *scratch_pool)
{
struct read_url_baton_t rub;
+
rub.url = url;
rub.result_pool = result_pool;
SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, read_url_txn, &rub,
@@ -13330,6 +13334,7 @@ svn_wc__db_revision_status(svn_revnum_t
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
struct revision_status_baton_t rsb;
+
rsb.min_revision = min_revision;
rsb.max_revision = max_revision;
rsb.is_sparse_checkout = is_sparse_checkout;
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=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_util.c Wed Jun 20 13:06:16 2012
@@ -197,6 +197,7 @@ svn_wc__db_with_txn(svn_wc__db_wcroot_t
apr_pool_t *scratch_pool)
{
struct txn_baton_t tb;
+
tb.wcroot = wcroot;
tb.local_relpath = local_relpath;
tb.cb_func = cb_func;
Modified: subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c Wed Jun
20 13:06:16 2012
@@ -83,6 +83,7 @@ proc_found(const char *proc, apr_pool_t
/* all processes and their I/O data */
apr_proc_t process;
const char * args[2];
+
args[0] = proc;
args[1] = NULL;
svn_error_clear(adjust_proc_path(&args[0], &directory, pool));
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1352080&r1=1352079&r2=1352080&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Jun 20
13:06:16 2012
@@ -239,6 +239,7 @@ wc_update(svn_test__sandbox_t *b, const
apr_array_header_t *paths = apr_array_make(b->pool, 1,
sizeof(const char *));
svn_opt_revision_t revision;
+
revision.kind = svn_opt_revision_number;
revision.value.number = revnum;
