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 2015/01/02 16:35:13 UTC
svn commit: r1649067 - in /subversion/trunk/subversion/libsvn_fs_x:
changes.h fs.h temp_serializer.c transaction.c tree.c
Author: stefan2
Date: Fri Jan 2 15:35:13 2015
New Revision: 1649067
URL: http://svn.apache.org/r1649067
Log:
Follow-up to r1649066: Formatting changes to keep within 80 columns.
No functional change.
This is the final patch in of this series.
* subversion/libsvn_fs_x/changes.h
(svn_fs_x__changes_t): Word-wrap docstring.
* subversion/libsvn_fs_x/fs.h
(svn_fs_x__data_t): Same.
* subversion/libsvn_fs_x/temp_serializer.c
(svn_fs_x__deserialize_changes): Insert line break.
* subversion/libsvn_fs_x/tree.c
(x_paths_changed): Same.
* subversion/libsvn_fs_x/transaction.c
(path_change_dup): Reformat code.
Modified:
subversion/trunk/subversion/libsvn_fs_x/changes.h
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_x/changes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/changes.h?rev=1649067&r1=1649066&r2=1649067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/changes.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/changes.h Fri Jan 2 15:35:13 2015
@@ -39,7 +39,8 @@
* access to the data.
*/
-/* An opaque collection of change lists (apr_array_header_t * of svn_fs_x__change_t*).
+/* An opaque collection of change lists (apr_array_header_t * of
+ * svn_fs_x__change_t *).
*/
typedef struct svn_fs_x__changes_t svn_fs_x__changes_t;
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649067&r1=1649066&r2=1649067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 15:35:13 2015
@@ -311,7 +311,8 @@ typedef struct svn_fs_x__data_t
respective pack file. */
svn_cache__t *packed_offset_cache;
- /* Cache for txdelta_window_t objects; the key is svn_fs_x__window_cache_key_t */
+ /* Cache for txdelta_window_t objects;
+ * the key is svn_fs_x__window_cache_key_t */
svn_cache__t *txdelta_window_cache;
/* Cache for combined windows as svn_stringbuf_t objects;
Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c?rev=1649067&r1=1649066&r2=1649067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c Fri Jan 2 15:35:13 2015
@@ -1126,7 +1126,8 @@ svn_fs_x__deserialize_changes(void **out
{
int i;
changes_data_t *changes = (changes_data_t *)data;
- apr_array_header_t *array = apr_array_make(pool, 0, sizeof(svn_fs_x__change_t *));
+ apr_array_header_t *array = apr_array_make(pool, 0,
+ sizeof(svn_fs_x__change_t *));
/* de-serialize our auxiliary data structure */
svn_temp_deserializer__resolve(changes, (void**)&changes->changes);
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649067&r1=1649066&r2=1649067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 2 15:35:13 2015
@@ -864,9 +864,11 @@ static svn_fs_x__change_t *
path_change_dup(const svn_fs_x__change_t *source,
apr_pool_t *result_pool)
{
- svn_fs_x__change_t *result = apr_pmemdup(result_pool, source, sizeof(*source));
- result->path.data = apr_pstrmemdup(result_pool, source->path.data,
- source->path.len);
+ svn_fs_x__change_t *result
+ = apr_pmemdup(result_pool, source, sizeof(*source));
+ result->path.data
+ = apr_pstrmemdup(result_pool, source->path.data, source->path.len);
+
if (source->copyfrom_path)
result->copyfrom_path = apr_pstrdup(result_pool, source->copyfrom_path);
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649067&r1=1649066&r2=1649067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 15:35:13 2015
@@ -3291,7 +3291,8 @@ x_paths_changed(apr_hash_t **changed_pat
changed_paths = svn_hash__make(pool);
for (i = 0; i < changes->nelts; ++i)
{
- svn_fs_x__change_t *change = APR_ARRAY_IDX(changes, i, svn_fs_x__change_t *);
+ svn_fs_x__change_t *change = APR_ARRAY_IDX(changes, i,
+ svn_fs_x__change_t *);
SVN_ERR(construct_fs_path_change(&path_change, context, change,
pool));
apr_hash_set(changed_paths, change->path.data, change->path.len,