svn commit: r1649065 - in /subversion/trunk/subversion/libsvn_fs_x: dag.h temp_serializer.c tree.c

[st...@apache.org]

Author: stefan2
Date: Fri Jan  2 15:17:17 2015
New Revision: 1649065

URL: http://svn.apache.org/r1649065
Log:
Follow-up to r1649062: Formatting changes to keep within 80 columns.
No functional change.

* subversion/libsvn_fs_x/dag.h
  (svn_fs_x__dag_open): Shorten docstring.

* subversion/libsvn_fs_x/temp_serializer.c
  (serialize_dir,
   slowly_replace_dir_entry): Insert line breaks.

* subversion/libsvn_fs_x/tree.c
  (compare_dir_structure,
   x_dir_entries): Same.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/dag.h
    subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
    subversion/trunk/subversion/libsvn_fs_x/tree.c

Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1649065&r1=1649064&r2=1649065&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.h Fri Jan  2 15:17:17 2015
@@ -294,7 +294,7 @@ svn_fs_x__dag_open(dag_node_t **child_p,
 
 
 /* Set *ENTRIES_P to an array of NODE's entries, sorted by entry names,
-   and the values are svn_fs_x__dirent_t's.  The returned table (and elements)
+   and the values are svn_fs_x__dirent_t. The returned table (and elements)
    is allocated in POOL, which is also used for temporary allocations. */
 svn_error_t *svn_fs_x__dag_dir_entries(apr_array_header_t **entries_p,
                                        dag_node_t *node,

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=1649065&r1=1649064&r2=1649065&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:17:17 2015
@@ -247,7 +247,8 @@ serialize_dir(apr_array_header_t *entrie
   /* calculate sizes */
   int count = entries->nelts;
   apr_size_t over_provision = 2 + count / 4;
-  apr_size_t entries_len = (count + over_provision) * sizeof(svn_fs_x__dirent_t*);
+  apr_size_t entries_len =   (count + over_provision)
+                           * sizeof(svn_fs_x__dirent_t*);
   apr_size_t lengths_len = (count + over_provision) * sizeof(apr_uint32_t);
 
   /* copy the hash entries to an auxiliary struct of known layout */
@@ -868,7 +869,8 @@ slowly_replace_dir_entry(void **data,
     {
       /* Replace ENTRY with / insert the NEW_ENTRY */
       if (entry)
-        APR_ARRAY_IDX(dir, idx, svn_fs_x__dirent_t *) = replace_baton->new_entry;
+        APR_ARRAY_IDX(dir, idx, svn_fs_x__dirent_t *)
+          = replace_baton->new_entry;
       else
         svn_sort__array_insert(dir, &replace_baton->new_entry, idx);
     }

Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649065&r1=1649064&r2=1649065&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan  2 15:17:17 2015
@@ -1659,8 +1659,10 @@ compare_dir_structure(svn_boolean_t *cha
      entries one-by-one without binary lookup etc. */
   for (i = 0; i < lhs_entries->nelts; ++i)
     {
-      svn_fs_x__dirent_t *lhs_entry = APR_ARRAY_IDX(lhs_entries, i, svn_fs_x__dirent_t *);
-      svn_fs_x__dirent_t *rhs_entry = APR_ARRAY_IDX(rhs_entries, i, svn_fs_x__dirent_t *);
+      svn_fs_x__dirent_t *lhs_entry
+        = APR_ARRAY_IDX(lhs_entries, i, svn_fs_x__dirent_t *);
+      svn_fs_x__dirent_t *rhs_entry
+        = APR_ARRAY_IDX(rhs_entries, i, svn_fs_x__dirent_t *);
 
       if (strcmp(lhs_entry->name, rhs_entry->name) == 0)
         {
@@ -2357,7 +2359,8 @@ x_dir_entries(apr_hash_t **table_p,
   /* Convert directory array to hash. */
   for (i = 0; i < table->nelts; ++i)
     {
-      svn_fs_x__dirent_t *entry = APR_ARRAY_IDX(table, i, svn_fs_x__dirent_t *);
+      svn_fs_x__dirent_t *entry
+        = APR_ARRAY_IDX(table, i, svn_fs_x__dirent_t *);
 
       svn_fs_dirent_t *api_dirent = apr_pcalloc(pool, sizeof(*api_dirent));
       api_dirent->name = entry->name;