svn commit: r1508439 - in /subversion/branches/fsx/subversion: include/private/svn_string_private.h libsvn_fs_x/pack.c libsvn_subr/prefix_string.c

[st...@apache.org]

Author: stefan2
Date: Tue Jul 30 13:51:39 2013
New Revision: 1508439

URL: http://svn.apache.org/r1508439
Log:
On the fsx branch: follow-up to r1508120.
Rename svn__prefix_tree_* to svn_prefix_tree__*.

* subversion/include/private/svn_string_private.h
  (svn__prefix_tree_*): rename to ...
  (svn_prefix_tree__*): ... this

* subversion/libsvn_subr/prefix_string.c
  (svn__prefix_tree_*): rename to ...
  (svn_prefix_tree__*): ... this
  (auto_realloc_sub_nodes,
   svn_prefix_string__create): update type references

* subversion/libsvn_fs_x/pack.c
  (pack_context_t,
   initialize_pack_context): update API users

Modified:
    subversion/branches/fsx/subversion/include/private/svn_string_private.h
    subversion/branches/fsx/subversion/libsvn_fs_x/pack.c
    subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c

Modified: subversion/branches/fsx/subversion/include/private/svn_string_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/include/private/svn_string_private.h?rev=1508439&r1=1508438&r2=1508439&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/include/private/svn_string_private.h (original)
+++ subversion/branches/fsx/subversion/include/private/svn_string_private.h Tue Jul 30 13:51:39 2013
@@ -283,20 +283,20 @@ typedef struct svn_prefix_string__t svn_
 /**
  * Opaque data type representing a prefix tree
  */
-typedef struct svn__prefix_tree_t svn__prefix_tree_t;
+typedef struct svn_prefix_tree__t svn_prefix_tree__t;
 
 /**
  * Return a new prefix tree allocated in @a pool.
  */
-svn__prefix_tree_t *
-svn__prefix_tree_create(apr_pool_t *pool);
+svn_prefix_tree__t *
+svn_prefix_tree__create(apr_pool_t *pool);
 
 /**
  * Return a string with the value @a s stored in @a tree.  If no such string
  * exists yet, add it automatically.
  */
 svn_prefix_string__t *
-svn_prefix_string__create(svn__prefix_tree_t *tree,
+svn_prefix_string__create(svn_prefix_tree__t *tree,
                           const char *s);
 
 /**

Modified: subversion/branches/fsx/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_fs_x/pack.c?rev=1508439&r1=1508438&r2=1508439&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/fsx/subversion/libsvn_fs_x/pack.c Tue Jul 30 13:51:39 2013
@@ -186,7 +186,7 @@ typedef struct pack_context_t
   apr_file_t *dir_props_file;
 
   /* container for all PATH members in PATH_ORDER. */
-  svn__prefix_tree_t *paths;
+  svn_prefix_tree__t *paths;
 
   /* array of path_order_t *.  Will be filled in phase 2 and be cleared
    * after each revision range.  Sorted by PATH, NODE_ID. */
@@ -300,7 +300,7 @@ initialize_pack_context(pack_context_t *
 
   /* the pool used for temp structures */
   context->info_pool = svn_pool_create(pool);
-  context->paths = svn__prefix_tree_create(context->info_pool);
+  context->paths = svn_prefix_tree__create(context->info_pool);
 
   return SVN_NO_ERROR;
 };

Modified: subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c?rev=1508439&r1=1508438&r2=1508439&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c (original)
+++ subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c Tue Jul 30 13:51:39 2013
@@ -80,7 +80,7 @@ struct node_t
 };
 
 /* The actual tree structure. */
-struct svn__prefix_tree_t
+struct svn_prefix_tree__t
 {
   /* the common tree root (represents the empty prefix). */
   node_t *root;
@@ -101,7 +101,7 @@ is_leaf(node_t *node)
  * unused entry.  Re-allocate as necessary.
  */
 static void
-auto_realloc_sub_nodes(svn__prefix_tree_t *tree,
+auto_realloc_sub_nodes(svn_prefix_tree__t *tree,
                        node_t *node)
 {
   if (node->sub_node_count & (node->sub_node_count - 1))
@@ -147,10 +147,10 @@ search_lower_bound(node_t **sub_nodes,
   return lower;
 }
 
-svn__prefix_tree_t *
-svn__prefix_tree_create(apr_pool_t *pool)
+svn_prefix_tree__t *
+svn_prefix_tree__create(apr_pool_t *pool)
 {
-  svn__prefix_tree_t *tree = apr_pcalloc(pool, sizeof(*tree));
+  svn_prefix_tree__t *tree = apr_pcalloc(pool, sizeof(*tree));
   tree->pool = pool;
 
   tree->root = apr_pcalloc(pool, sizeof(*tree->root));
@@ -160,7 +160,7 @@ svn__prefix_tree_create(apr_pool_t *pool
 }
 
 svn_prefix_string__t *
-svn_prefix_string__create(svn__prefix_tree_t *tree,
+svn_prefix_string__create(svn_prefix_tree__t *tree,
                           const char *s)
 {
   svn_prefix_string__t *new_string;