You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/26 17:36:50 UTC
svn commit: r1390570 - in /subversion/trunk/subversion/libsvn_ra_svn:
client.c editorp.c
Author: stefan2
Date: Wed Sep 26 15:36:50 2012
New Revision: 1390570
URL: http://svn.apache.org/viewvc?rev=1390570&view=rev
Log:
Indentation fixes where we replaced svn_ra_svn_write_cmd with
svn_ra_svn_write_templated_cmd. No functional change.
* subversion/libsvn_ra_svn/client.c
(ra_svn_set_path): fixed indentation
* subversion/libsvn_ra_svn/editorp.c
(check_for_error,
ra_svn_target_rev,
ra_svn_open_root,
ra_svn_delete_entry,
ra_svn_add_dir,
ra_svn_open_dir,
ra_svn_close_dir,
ra_svn_absent_dir,
ra_svn_add_file,
ra_svn_open_file,
ra_svn_close_file,
ra_svn_absent_file,
ra_svn_close_edit,
ra_svn_abort_edit): fixed indentation
Found by: cmpilato
Modified:
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/editorp.c
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1390570&r1=1390569&r2=1390570&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Wed Sep 26 15:36:50 2012
@@ -258,9 +258,10 @@ static svn_error_t *ra_svn_set_path(void
{
ra_svn_reporter_baton_t *b = baton;
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_set_path,
- path, rev, start_empty, lock_token,
- svn_depth_to_word(depth)));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_set_path,
+ path, rev, start_empty, lock_token,
+ svn_depth_to_word(depth)));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1390570&r1=1390569&r2=1390570&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Sep 26 15:36:50 2012
@@ -127,7 +127,8 @@ static svn_error_t *check_for_error(ra_s
if (svn_ra_svn__input_waiting(eb->conn, pool))
{
eb->got_status = TRUE;
- SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_abort_edit));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_abort_edit));
SVN_ERR(svn_ra_svn_read_cmd_response(eb->conn, pool, ""));
/* We shouldn't get here if the consumer is doing its job. */
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
@@ -142,7 +143,8 @@ static svn_error_t *ra_svn_target_rev(vo
ra_svn_edit_baton_t *eb = edit_baton;
SVN_ERR(check_for_error(eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_target_rev, rev));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_target_rev, rev));
return SVN_NO_ERROR;
}
@@ -153,8 +155,9 @@ static svn_error_t *ra_svn_open_root(voi
const char *token = make_token('d', eb, pool);
SVN_ERR(check_for_error(eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_open_root, rev,
- token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_open_root, rev,
+ token));
*root_baton = ra_svn_make_baton(eb->conn, pool, eb, token);
return SVN_NO_ERROR;
}
@@ -165,8 +168,9 @@ static svn_error_t *ra_svn_delete_entry(
ra_svn_baton_t *b = parent_baton;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_delete_entry,
- path, rev, b->token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_delete_entry,
+ path, rev, b->token));
return SVN_NO_ERROR;
}
@@ -181,8 +185,10 @@ static svn_error_t *ra_svn_add_dir(const
SVN_ERR_ASSERT((copy_path && SVN_IS_VALID_REVNUM(copy_rev))
|| (!copy_path && !SVN_IS_VALID_REVNUM(copy_rev)));
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_add_dir, path,
- b->token, token, copy_path, copy_rev));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_add_dir, path,
+ b->token, token, copy_path,
+ copy_rev));
*child_baton = ra_svn_make_baton(b->conn, pool, b->eb, token);
return SVN_NO_ERROR;
}
@@ -195,8 +201,9 @@ static svn_error_t *ra_svn_open_dir(cons
const char *token = make_token('d', b->eb, pool);
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_open_dir,
- path, b->token, token, rev));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_open_dir,
+ path, b->token, token, rev));
*child_baton = ra_svn_make_baton(b->conn, pool, b->eb, token);
return SVN_NO_ERROR;
}
@@ -208,8 +215,9 @@ static svn_error_t *ra_svn_change_dir_pr
ra_svn_baton_t *b = dir_baton;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_change_dir_prop,
- b->token, name, value));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_change_dir_prop,
+ b->token, name, value));
return SVN_NO_ERROR;
}
@@ -218,7 +226,9 @@ static svn_error_t *ra_svn_close_dir(voi
ra_svn_baton_t *b = dir_baton;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_close_dir, b->token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_close_dir,
+ b->token));
return SVN_NO_ERROR;
}
@@ -233,8 +243,9 @@ static svn_error_t *ra_svn_absent_dir(co
return SVN_NO_ERROR;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_absent_dir, path,
- b->token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_absent_dir, path,
+ b->token));
return SVN_NO_ERROR;
}
@@ -251,8 +262,10 @@ static svn_error_t *ra_svn_add_file(cons
SVN_ERR_ASSERT((copy_path && SVN_IS_VALID_REVNUM(copy_rev))
|| (!copy_path && !SVN_IS_VALID_REVNUM(copy_rev)));
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_add_file, path,
- b->token, token, copy_path, copy_rev));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_add_file, path,
+ b->token, token, copy_path,
+ copy_rev));
*file_baton = ra_svn_make_baton(b->conn, pool, b->eb, token);
return SVN_NO_ERROR;
}
@@ -267,8 +280,9 @@ static svn_error_t *ra_svn_open_file(con
const char *token = make_token('c', b->eb, pool);
SVN_ERR(check_for_error(b->eb, b->pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_open_file,
- path, b->token, token, rev));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_open_file,
+ path, b->token, token, rev));
*file_baton = ra_svn_make_baton(b->conn, pool, b->eb, token);
return SVN_NO_ERROR;
}
@@ -282,8 +296,9 @@ static svn_error_t *ra_svn_svndiff_handl
SVN_ERR(check_for_error(b->eb, b->pool));
str.data = data;
str.len = *len;
- return svn_ra_svn_write_templated_cmd(b->conn, b->pool, svn_ra_svn_cmd_textdelta_chunk,
- b->token, &str);
+ return svn_ra_svn_write_templated_cmd(b->conn, b->pool,
+ svn_ra_svn_cmd_textdelta_chunk,
+ b->token, &str);
}
static svn_error_t *ra_svn_svndiff_close_handler(void *baton)
@@ -291,8 +306,9 @@ static svn_error_t *ra_svn_svndiff_close
ra_svn_baton_t *b = baton;
SVN_ERR(check_for_error(b->eb, b->pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, b->pool, svn_ra_svn_cmd_textdelta_end,
- b->token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, b->pool,
+ svn_ra_svn_cmd_textdelta_end,
+ b->token));
return SVN_NO_ERROR;
}
@@ -307,8 +323,9 @@ static svn_error_t *ra_svn_apply_textdel
/* Tell the other side we're starting a text delta. */
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_apply_textdelta,
- b->token, base_checksum));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_apply_textdelta,
+ b->token, base_checksum));
/* Transform the window stream to an svndiff stream. Reuse the
* file baton for the stream handler, since it has all the
@@ -337,8 +354,9 @@ static svn_error_t *ra_svn_change_file_p
ra_svn_baton_t *b = file_baton;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_change_file_prop,
- b->token, name, value));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_change_file_prop,
+ b->token, name, value));
return SVN_NO_ERROR;
}
@@ -349,8 +367,9 @@ static svn_error_t *ra_svn_close_file(vo
ra_svn_baton_t *b = file_baton;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_close_file,
- b->token, text_checksum));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_close_file,
+ b->token, text_checksum));
return SVN_NO_ERROR;
}
@@ -365,8 +384,9 @@ static svn_error_t *ra_svn_absent_file(c
return SVN_NO_ERROR;
SVN_ERR(check_for_error(b->eb, pool));
- SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool, svn_ra_svn_cmd_absent_file, path,
- b->token));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(b->conn, pool,
+ svn_ra_svn_cmd_absent_file, path,
+ b->token));
return SVN_NO_ERROR;
}
@@ -377,11 +397,13 @@ static svn_error_t *ra_svn_close_edit(vo
SVN_ERR_ASSERT(!eb->got_status);
eb->got_status = TRUE;
- SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_close_edit));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_close_edit));
err = svn_ra_svn_read_cmd_response(eb->conn, pool, "");
if (err)
{
- svn_error_clear(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_abort_edit));
+ svn_error_clear(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_abort_edit));
return err;
}
if (eb->callback)
@@ -395,7 +417,8 @@ static svn_error_t *ra_svn_abort_edit(vo
if (eb->got_status)
return SVN_NO_ERROR;
- SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool, svn_ra_svn_cmd_abort_edit));
+ SVN_ERR(svn_ra_svn_write_templated_cmd(eb->conn, pool,
+ svn_ra_svn_cmd_abort_edit));
SVN_ERR(svn_ra_svn_read_cmd_response(eb->conn, pool, ""));
return SVN_NO_ERROR;
}