[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r34926 - in trunk/subversion: include/private libsvn_fs_base libsvn_fs_base/bdb libsvn_fs_base/util libsvn_subr tests/libsvn_fs_base tests/libsvn_subr

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 24 Dec 2008 09:57:08 -0800 (PST)

For efficiency reasons, the system has converted the large body of this message into an attachment.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=991755

attached mail follows:


svn_skel__t like svn_cache__t?

--dave

On Dec 24, 2008 9:36 AM, "Hyrum K. Wright" <hyrum_at_hyrumwright.org> wrote:

For efficiency reasons, the system has converted the large body of this
message into an attachment.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=991749

---------- Forwarded message ----------
From: hwright_at_tigris.org
To: svn_at_subversion.tigris.org
Date: Wed, 24 Dec 2008 09:36:34 -0800
Subject: svn commit: r34926 - in trunk/subversion: include/private
libsvn_fs_base libsvn_fs_base/bdb libsvn_fs_base/util libsvn_subr
tests/libsvn_fs_base tests/libsvn_subr
Author: hwright
Date: Wed Dec 24 09:36:34 2008
New Revision: 34926

Log:
Followup to the move of the skels logic to libsvn_subr: Rename skel_t to
svn_skel_t. While this symbol is defined in a private header file, and I
don't know that we have a hard-and-fast policy for those, consistency
dictates we make this change.

* subversion/libsvn_subr/skel.c,
 subversion/tests/libsvn_fs_base/strings-reps-test.c,
 subversion/tests/libsvn_subr/skel-test.c,
 subversion/libsvn_fs_base/bdb/reps-table.c,
 subversion/libsvn_fs_base/bdb/copies-table.c,
 subversion/libsvn_fs_base/bdb/dbt.c,
 subversion/libsvn_fs_base/bdb/dbt.h,
 subversion/libsvn_fs_base/bdb/nodes-table.c,
 subversion/libsvn_fs_base/bdb/txn-table.c,
 subversion/libsvn_fs_base/bdb/locks-table.c,
 subversion/libsvn_fs_base/bdb/rev-table.c,
 subversion/libsvn_fs_base/bdb/changes-table.c,
 subversion/libsvn_fs_base/dag.c,
 subversion/libsvn_fs_base/util/fs_skels.h,
 subversion/libsvn_fs_base/util/fs_skels.c,
 subversion/include/private/svn_skel.h:
 Update references from skel_t to svn_skel_t.

Modified:
  trunk/subversion/include/private/svn_skel.h
  trunk/subversion/libsvn_fs_base/bdb/changes-table.c
  trunk/subversion/libsvn_fs_base/bdb/copies-table.c
  trunk/subversion/libsvn_fs_base/bdb/dbt.c
  trunk/subversion/libsvn_fs_base/bdb/dbt.h
  trunk/subversion/libsvn_fs_base/bdb/locks-table.c
  trunk/subversion/libsvn_fs_base/bdb/nodes-table.c
  trunk/subversion/libsvn_fs_base/bdb/reps-table.c
  trunk/subversion/libsvn_fs_base/bdb/rev-table.c
  trunk/subversion/libsvn_fs_base/bdb/txn-table.c
  trunk/subversion/libsvn_fs_base/dag.c
  trunk/subversion/libsvn_fs_base/util/fs_skels.c
  trunk/subversion/libsvn_fs_base/util/fs_skels.h
  trunk/subversion/libsvn_subr/skel.c
  trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
  trunk/subversion/tests/libsvn_subr/skel-test.c

Modified: trunk/subversion/include/private/svn_skel.h
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/include/private/svn_skel.h?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/include/private/svn_skel.h Wed Dec 24 08:16:19 2008
   (r34925)
+++ trunk/subversion/include/private/svn_skel.h Wed Dec 24 09:36:34 2008
   (r34926)
@@ -76,7 +76,7 @@ extern "C" {

 /* A structure representing the results of parsing an array of bytes
   as a skel. */
-struct skel_t {
+struct svn_skel_t {

  /* True if the string was an atom, false if it was a list.

@@ -93,10 +93,10 @@ struct skel_t {
  /* If the string is a list, CHILDREN is a pointer to a
     null-terminated linked list of skel objects representing the
     elements of the list, linked through their NEXT pointers. */
- struct skel_t *children;
- struct skel_t *next;
+ struct svn_skel_t *children;
+ struct svn_skel_t *next;
 };
-typedef struct skel_t skel_t;
+typedef struct svn_skel_t svn_skel_t;

@@ -110,40 +110,40 @@ typedef struct skel_t skel_t;

   The returned skel objects point into the block indicated by DATA
   and LEN; we don't copy the contents. */
-skel_t *svn_skel__parse(const char *data, apr_size_t len,
- apr_pool_t *pool);
+svn_skel_t *svn_skel__parse(const char *data, apr_size_t len,
+ apr_pool_t *pool);

 /* Create an atom skel whose contents are the C string STR, allocated
   from POOL. */
-skel_t *svn_skel__str_atom(const char *str, apr_pool_t *pool);
+svn_skel_t *svn_skel__str_atom(const char *str, apr_pool_t *pool);

 /* Create an atom skel whose contents are the LEN bytes at ADDR,
   allocated from POOL. */
-skel_t *svn_skel__mem_atom(const void *addr, apr_size_t len,
- apr_pool_t *pool);
+svn_skel_t *svn_skel__mem_atom(const void *addr, apr_size_t len,
+ apr_pool_t *pool);

 /* Create an empty list skel, allocated from POOL. */
-skel_t *svn_skel__make_empty_list(apr_pool_t *pool);
+svn_skel_t *svn_skel__make_empty_list(apr_pool_t *pool);

 /* Prepend SKEL to LIST. */
-void svn_skel__prepend(skel_t *skel, skel_t *list);
+void svn_skel__prepend(svn_skel_t *skel, svn_skel_t *list);

 /* Return a string whose contents are a concrete representation of
   SKEL. Allocate the string from POOL. */
-svn_stringbuf_t *svn_skel__unparse(const skel_t *skel, apr_pool_t *pool);
+svn_stringbuf_t *svn_skel__unparse(const svn_skel_t *skel, apr_pool_t
*pool);

 /* Return true iff SKEL is an atom whose data is the same as STR. */
-svn_boolean_t svn_skel__matches_atom(const skel_t *skel, const char *str);
+svn_boolean_t svn_skel__matches_atom(const svn_skel_t *skel, const char
*str);

 /* Return the length of the list skel SKEL. Atoms have a length of -1. */
-int svn_skel__list_length(const skel_t *skel);
+int svn_skel__list_length(const svn_skel_t *skel);

 #ifdef __cplusplus

Modified: trunk/subversion/libsvn_fs_base/bdb/changes-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/changes-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/changes-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/changes-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -75,7 +75,7 @@ svn_fs_bdb__changes_add(svn_fs_t *fs,
 {
  base_fs_data_t *bfd = fs->fsap_data;
  DBT query, value;
- skel_t *skel;
+ svn_skel_t *skel;

  /* Convert native type to skel. */
  SVN_ERR(svn_fs_base__unparse_change_skel(&skel, change, pool));
@@ -265,7 +265,7 @@ svn_fs_bdb__changes_fetch(apr_hash_t **c
  while (! db_err)
    {
      change_t *change;
- skel_t *result_skel;
+ svn_skel_t *result_skel;

      /* Clear the per-iteration subpool. */
      svn_pool_clear(subpool);
@@ -387,7 +387,7 @@ svn_fs_bdb__changes_fetch_raw(apr_array_

  while (! db_err)
    {
- skel_t *result_skel;
+ svn_skel_t *result_skel;

      /* RESULT now contains a change record associated with KEY. We
         need to parse that skel into an change_t structure ... */

Modified: trunk/subversion/libsvn_fs_base/bdb/copies-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/copies-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/copies-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/copies-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -73,7 +73,7 @@ put_copy(svn_fs_t *fs,
         apr_pool_t *pool)
 {
  base_fs_data_t *bfd = fs->fsap_data;
- skel_t *copy_skel;
+ svn_skel_t *copy_skel;
  DBT key, value;

  /* Convert native type to skel. */
@@ -177,7 +177,7 @@ svn_fs_bdb__get_copy(copy_t **copy_p,
  base_fs_data_t *bfd = fs->fsap_data;
  DBT key, value;
  int db_err;
- skel_t *skel;
+ svn_skel_t *skel;
  copy_t *copy;

  /* Only in the context of this function do we know that the DB call

Modified: trunk/subversion/libsvn_fs_base/bdb/dbt.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/dbt.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/dbt.c Wed Dec 24 08:16:19 2008
   (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/dbt.c Wed Dec 24 09:36:34 2008
   (r34926)
@@ -138,7 +138,7 @@ svn_fs_base__id_to_dbt(DBT *dbt,
 /* Set DBT to the unparsed form of SKEL; allocate memory from POOL. */
 DBT *
 svn_fs_base__skel_to_dbt(DBT *dbt,
- skel_t *skel,
+ svn_skel_t *skel,
                         apr_pool_t *pool)
 {
  svn_stringbuf_t *unparsed_skel = svn_skel__unparse(skel, pool);

Modified: trunk/subversion/libsvn_fs_base/bdb/dbt.h
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/dbt.h?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/dbt.h Wed Dec 24 08:16:19 2008
   (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/dbt.h Wed Dec 24 09:36:34 2008
   (r34926)
@@ -96,7 +96,7 @@ DBT *svn_fs_base__id_to_dbt(DBT *dbt, co

 /* Set DBT to the unparsed form of SKEL; allocate memory from POOL.
   Return DBT. */
-DBT *svn_fs_base__skel_to_dbt(DBT *dbt, skel_t *skel, apr_pool_t *pool);
+DBT *svn_fs_base__skel_to_dbt(DBT *dbt, svn_skel_t *skel, apr_pool_t
*pool);

 /* Set DBT to the text of the null-terminated string STR. DBT will

Modified: trunk/subversion/libsvn_fs_base/bdb/locks-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/locks-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/locks-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/locks-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -74,7 +74,7 @@ svn_fs_bdb__lock_add(svn_fs_t *fs,
                     apr_pool_t *pool)
 {
  base_fs_data_t *bfd = fs->fsap_data;
- skel_t *lock_skel;
+ svn_skel_t *lock_skel;
  DBT key, value;

  /* Convert native type to skel. */
@@ -121,7 +121,7 @@ svn_fs_bdb__lock_get(svn_lock_t **lock_p
  base_fs_data_t *bfd = fs->fsap_data;
  DBT key, value;
  int db_err;
- skel_t *skel;
+ svn_skel_t *skel;
  svn_lock_t *lock;

  svn_fs_base__trail_debug(trail, "lock", "get");

Modified: trunk/subversion/libsvn_fs_base/bdb/nodes-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/nodes-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/nodes-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/nodes-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -196,7 +196,7 @@ svn_fs_bdb__get_node_revision(node_revis
 {
  base_fs_data_t *bfd = fs->fsap_data;
  node_revision_t *noderev;
- skel_t *skel;
+ svn_skel_t *skel;
  int db_err;
  DBT key, value;

@@ -239,7 +239,7 @@ svn_fs_bdb__put_node_revision(svn_fs_t *
  base_fs_data_t *bfd = fs->fsap_data;
  DB_TXN *db_txn = trail->db_txn;
  DBT key, value;
- skel_t *skel;
+ svn_skel_t *skel;

  /* Convert from native type into skel */
  SVN_ERR(svn_fs_base__unparse_node_revision_skel(&skel, noderev,

Modified: trunk/subversion/libsvn_fs_base/bdb/reps-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/reps-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/reps-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/reps-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -75,7 +75,7 @@ svn_fs_bdb__read_rep(representation_t **
                     apr_pool_t *pool)
 {
  base_fs_data_t *bfd = fs->fsap_data;
- skel_t *skel;
+ svn_skel_t *skel;
  int db_err;
  DBT query, result;

@@ -112,7 +112,7 @@ svn_fs_bdb__write_rep(svn_fs_t *fs,
 {
  base_fs_data_t *bfd = fs->fsap_data;
  DBT query, result;
- skel_t *skel;
+ svn_skel_t *skel;

  /* Convert from native type to skel. */
  SVN_ERR(svn_fs_base__unparse_representation_skel(&skel, rep,

Modified: trunk/subversion/libsvn_fs_base/bdb/rev-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/rev-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/rev-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/rev-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -66,7 +66,7 @@ svn_fs_bdb__get_rev(revision_t **revisio
  base_fs_data_t *bfd = fs->fsap_data;
  int db_err;
  DBT key, value;
- skel_t *skel;
+ svn_skel_t *skel;
  revision_t *revision;

  /* Turn the revision number into a Berkeley DB record number.
@@ -116,7 +116,7 @@ svn_fs_bdb__put_rev(svn_revnum_t *rev,
  base_fs_data_t *bfd = fs->fsap_data;
  int db_err;
  db_recno_t recno = 0;
- skel_t *skel;
+ svn_skel_t *skel;
  DBT key, value;

  /* Convert native type to skel. */

Modified: trunk/subversion/libsvn_fs_base/bdb/txn-table.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/bdb/txn-table.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/bdb/txn-table.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/bdb/txn-table.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -80,7 +80,7 @@ svn_fs_bdb__put_txn(svn_fs_t *fs,
                    apr_pool_t *pool)
 {
  base_fs_data_t *bfd = fs->fsap_data;
- skel_t *txn_skel;
+ svn_skel_t *txn_skel;
  DBT key, value;

  /* Convert native type to skel. */
@@ -196,7 +196,7 @@ svn_fs_bdb__get_txn(transaction_t **txn_
  base_fs_data_t *bfd = fs->fsap_data;
  DBT key, value;
  int db_err;
- skel_t *skel;
+ svn_skel_t *skel;
  transaction_t *transaction;

  /* Only in the context of this function do we know that the DB call
@@ -259,7 +259,7 @@ svn_fs_bdb__get_txn_list(apr_array_heade
                                DB_NEXT))
    {
      transaction_t *txn;
- skel_t *txn_skel;
+ svn_skel_t *txn_skel;
      svn_error_t *err;

      /* Clear the per-iteration subpool */

Modified: trunk/subversion/libsvn_fs_base/dag.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/dag.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/dag.c Wed Dec 24 08:16:19 2008
   (r34925)
+++ trunk/subversion/libsvn_fs_base/dag.c Wed Dec 24 09:36:34 2008
   (r34926)
@@ -275,7 +275,7 @@ get_dir_entries(apr_hash_t **entries_p,
  apr_hash_t *entries = apr_hash_make(pool);
  apr_hash_index_t *hi;
  svn_string_t entries_raw;
- skel_t *entries_skel;
+ svn_skel_t *entries_skel;

  /* Error if this is not a directory. */
  if (noderev->kind != svn_node_dir)
@@ -372,7 +372,7 @@ set_entry(dag_node_t *parent,
  apr_size_t len;
  svn_string_t raw_entries;
  svn_stringbuf_t *raw_entries_buf;
- skel_t *entries_skel;
+ svn_skel_t *entries_skel;
  svn_fs_t *fs = svn_fs_base__dag_get_fs(parent);

  /* Get the parent's node-revision. */
@@ -540,7 +540,7 @@ svn_fs_base__dag_get_proplist(apr_hash_t
  node_revision_t *noderev;
  apr_hash_t *proplist = NULL;
  svn_string_t raw_proplist;
- skel_t *proplist_skel;
+ svn_skel_t *proplist_skel;

  /* Go get a fresh NODE-REVISION for this node. */
  SVN_ERR(svn_fs_bdb__get_node_revision(&noderev, node->fs, node->id,
@@ -580,7 +580,7 @@ svn_fs_base__dag_set_proplist(dag_node_t
  svn_fs_t *fs = svn_fs_base__dag_get_fs(node);
  svn_stream_t *wstream;
  apr_size_t len;
- skel_t *proplist_skel;
+ svn_skel_t *proplist_skel;
  svn_stringbuf_t *raw_proplist_buf;
  base_fs_data_t *bfd = fs->fsap_data;

@@ -846,7 +846,7 @@ svn_fs_base__dag_delete(dag_node_t *pare
  node_revision_t *parent_noderev;
  const char *rep_key, *mutable_rep_key;
  apr_hash_t *entries = NULL;
- skel_t *entries_skel;
+ svn_skel_t *entries_skel;
  svn_fs_t *fs = parent->fs;
  svn_string_t str;
  svn_fs_id_t *id = NULL;

Modified: trunk/subversion/libsvn_fs_base/util/fs_skels.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/util/fs_skels.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/util/fs_skels.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/util/fs_skels.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -45,7 +45,7 @@ skel_err(const char *skel_type)
 /*** Validity Checking ***/

 static svn_boolean_t
-is_valid_checksum_skel(skel_t *skel)
+is_valid_checksum_skel(svn_skel_t *skel)
 {
  if (svn_skel__list_length(skel) != 2)
    return FALSE;
@@ -63,13 +63,13 @@ is_valid_checksum_skel(skel_t *skel)

 static svn_boolean_t
-is_valid_proplist_skel(skel_t *skel)
+is_valid_proplist_skel(svn_skel_t *skel)
 {
  int len = svn_skel__list_length(skel);

  if ((len >= 0) && (len & 1) == 0)
    {
- skel_t *elt;
+ svn_skel_t *elt;

      for (elt = skel->children; elt; elt = elt->next)
        if (! elt->is_atom)
@@ -83,7 +83,7 @@ is_valid_proplist_skel(skel_t *skel)

 static svn_boolean_t
-is_valid_revision_skel(skel_t *skel)
+is_valid_revision_skel(svn_skel_t *skel)
 {
  int len = svn_skel__list_length(skel);

@@ -97,7 +97,7 @@ is_valid_revision_skel(skel_t *skel)

 static svn_boolean_t
-is_valid_transaction_skel(skel_t *skel, transaction_kind_t *kind)
+is_valid_transaction_skel(svn_skel_t *skel, transaction_kind_t *kind)
 {
  int len = svn_skel__list_length(skel);

@@ -125,11 +125,11 @@ is_valid_transaction_skel(skel_t *skel,

 static svn_boolean_t
-is_valid_rep_delta_chunk_skel(skel_t *skel)
+is_valid_rep_delta_chunk_skel(svn_skel_t *skel)
 {
  int len;
- skel_t *window;
- skel_t *diff;
+ svn_skel_t *window;
+ svn_skel_t *diff;

  /* check the delta skel. */
  if ((svn_skel__list_length(skel) != 2)
@@ -164,10 +164,10 @@ is_valid_rep_delta_chunk_skel(skel_t *sk

 static svn_boolean_t
-is_valid_representation_skel(skel_t *skel)
+is_valid_representation_skel(svn_skel_t *skel)
 {
  int len = svn_skel__list_length(skel);
- skel_t *header;
+ svn_skel_t *header;
  int header_len;

  /* the rep has at least two items in it, a HEADER list, and at least
@@ -203,7 +203,7 @@ is_valid_representation_skel(skel_t *ske
      && (svn_skel__matches_atom(header->children, "delta")))
    {
      /* it's a delta rep. check the validity. */
- skel_t *chunk = skel->children->next;
+ svn_skel_t *chunk = skel->children->next;

      /* loop over chunks, checking each one. */
      while (chunk)
@@ -222,7 +222,7 @@ is_valid_representation_skel(skel_t *ske

 static svn_boolean_t
-is_valid_node_revision_header_skel(skel_t *skel, skel_t **kind_p)
+is_valid_node_revision_header_skel(svn_skel_t *skel, svn_skel_t **kind_p)
 {
  int len = svn_skel__list_length(skel);

@@ -263,11 +263,11 @@ is_valid_node_revision_header_skel(skel_

 static svn_boolean_t
-is_valid_node_revision_skel(skel_t *skel)
+is_valid_node_revision_skel(svn_skel_t *skel)
 {
  int len = svn_skel__list_length(skel);
- skel_t *header = skel->children;
- skel_t *kind;
+ svn_skel_t *header = skel->children;
+ svn_skel_t *kind;

  if (len < 1)
    return FALSE;
@@ -314,7 +314,7 @@ is_valid_node_revision_skel(skel_t *skel

 static svn_boolean_t
-is_valid_copy_skel(skel_t *skel)
+is_valid_copy_skel(svn_skel_t *skel)
 {
  return (((svn_skel__list_length(skel) == 4)
           && (svn_skel__matches_atom(skel->children, "copy")
@@ -326,7 +326,7 @@ is_valid_copy_skel(skel_t *skel)

 static svn_boolean_t
-is_valid_change_skel(skel_t *skel, svn_fs_path_change_kind_t *kind)
+is_valid_change_skel(svn_skel_t *skel, svn_fs_path_change_kind_t *kind)
 {
  if ((svn_skel__list_length(skel) == 6)
      && svn_skel__matches_atom(skel->children, "change")
@@ -336,7 +336,7 @@ is_valid_change_skel(skel_t *skel, svn_f
      && skel->children->next->next->next->next->is_atom
      && skel->children->next->next->next->next->next->is_atom)
    {
- skel_t *kind_skel = skel->children->next->next->next;
+ svn_skel_t *kind_skel = skel->children->next->next->next;

      /* check the kind (and return it) */
      if (svn_skel__matches_atom(kind_skel, "reset"))
@@ -375,7 +375,7 @@ is_valid_change_skel(skel_t *skel, svn_f

 static svn_boolean_t
-is_valid_lock_skel(skel_t *skel)
+is_valid_lock_skel(svn_skel_t *skel)
 {
  if ((svn_skel__list_length(skel) == 8)
      && svn_skel__matches_atom(skel->children, "lock")
@@ -397,11 +397,11 @@ is_valid_lock_skel(skel_t *skel)

 svn_error_t *
 svn_fs_base__parse_proplist_skel(apr_hash_t **proplist_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                 apr_pool_t *pool)
 {
  apr_hash_t *proplist = NULL;
- skel_t *elt;
+ svn_skel_t *elt;

  /* Validate the skel. */
  if (! is_valid_proplist_skel(skel))
@@ -428,7 +428,7 @@ svn_fs_base__parse_proplist_skel(apr_has

 svn_error_t *
 svn_fs_base__parse_revision_skel(revision_t **revision_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                 apr_pool_t *pool)
 {
  revision_t *revision;
@@ -450,12 +450,12 @@ svn_fs_base__parse_revision_skel(revisio

 svn_error_t *
 svn_fs_base__parse_transaction_skel(transaction_t **transaction_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                    apr_pool_t *pool)
 {
  transaction_t *transaction;
  transaction_kind_t kind;
- skel_t *root_id, *base_id_or_rev, *proplist, *copies;
+ svn_skel_t *root_id, *base_id_or_rev, *proplist, *copies;
  int len;

  /* Validate the skel. */
@@ -505,7 +505,7 @@ svn_fs_base__parse_transaction_skel(tran
    {
      const char *copy_id;
      apr_array_header_t *txncopies;
- skel_t *cpy = copies->children;
+ svn_skel_t *cpy = copies->children;

      txncopies = apr_array_make(pool, len, sizeof(copy_id));
      while (cpy)
@@ -525,11 +525,11 @@ svn_fs_base__parse_transaction_skel(tran

 svn_error_t *
 svn_fs_base__parse_representation_skel(representation_t **rep_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                       apr_pool_t *pool)
 {
  representation_t *rep;
- skel_t *header_skel;
+ svn_skel_t *header_skel;

  /* Validate the skel. */
  if (! is_valid_representation_skel(skel))
@@ -552,7 +552,7 @@ svn_fs_base__parse_representation_skel(r
  /* MD5 */
  if (header_skel->children->next->next)
    {
- skel_t *checksum_skel = header_skel->children->next->next;
+ svn_skel_t *checksum_skel = header_skel->children->next->next;
      rep->md5_checksum =
        svn_checksum__from_digest((const unsigned char *)
                                  (checksum_skel->children->next->data),
@@ -581,7 +581,7 @@ svn_fs_base__parse_representation_skel(r
  else
    {
      /* "delta"-specific. */
- skel_t *chunk_skel = skel->children->next;
+ svn_skel_t *chunk_skel = skel->children->next;
      rep_delta_chunk_t *chunk;
      apr_array_header_t *chunks;

@@ -592,8 +592,8 @@ svn_fs_base__parse_representation_skel(r
      /* Process the chunks. */
      while (chunk_skel)
        {
- skel_t *window_skel = chunk_skel->children->next;
- skel_t *diff_skel = window_skel->children;
+ svn_skel_t *window_skel = chunk_skel->children->next;
+ svn_skel_t *diff_skel = window_skel->children;

          /* Allocate a chunk and its window */
          chunk = apr_palloc(pool, sizeof(*chunk));
@@ -640,11 +640,11 @@ svn_fs_base__parse_representation_skel(r

 svn_error_t *
 svn_fs_base__parse_node_revision_skel(node_revision_t **noderev_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                      apr_pool_t *pool)
 {
  node_revision_t *noderev;
- skel_t *header_skel, *cur_skel;
+ svn_skel_t *header_skel, *cur_skel;

  /* Validate the skel. */
  if (! is_valid_node_revision_skel(skel))
@@ -743,7 +743,7 @@ svn_fs_base__parse_node_revision_skel(no

 svn_error_t *
 svn_fs_base__parse_copy_skel(copy_t **copy_p,
- skel_t *skel,
+ svn_skel_t *skel,
                             apr_pool_t *pool)
 {
  copy_t *copy;
@@ -784,12 +784,12 @@ svn_fs_base__parse_copy_skel(copy_t **co

 svn_error_t *
 svn_fs_base__parse_entries_skel(apr_hash_t **entries_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                apr_pool_t *pool)
 {
  apr_hash_t *entries = NULL;
  int len = svn_skel__list_length(skel);
- skel_t *elt;
+ svn_skel_t *elt;

  if (! (len >= 0))
    return skel_err("entries");
@@ -828,7 +828,7 @@ svn_fs_base__parse_entries_skel(apr_hash

 svn_error_t *
 svn_fs_base__parse_change_skel(change_t **change_p,
- skel_t *skel,
+ svn_skel_t *skel,
                               apr_pool_t *pool)
 {
  change_t *change;
@@ -870,7 +870,7 @@ svn_fs_base__parse_change_skel(change_t

 svn_error_t *
 svn_fs_base__parse_lock_skel(svn_lock_t **lock_p,
- skel_t *skel,
+ svn_skel_t *skel,
                             apr_pool_t *pool)
 {
  svn_lock_t *lock;
@@ -941,11 +941,11 @@ svn_fs_base__parse_lock_skel(svn_lock_t
 /*** Unparsing (conversion from native FS type to skeleton) ***/

 svn_error_t *
-svn_fs_base__unparse_proplist_skel(skel_t **skel_p,
+svn_fs_base__unparse_proplist_skel(svn_skel_t **skel_p,
                                   apr_hash_t *proplist,
                                   apr_pool_t *pool)
 {
- skel_t *skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *skel = svn_skel__make_empty_list(pool);
  apr_hash_index_t *hi;

  /* Create the skel. */
@@ -980,11 +980,11 @@ svn_fs_base__unparse_proplist_skel(skel_

 svn_error_t *
-svn_fs_base__unparse_revision_skel(skel_t **skel_p,
+svn_fs_base__unparse_revision_skel(svn_skel_t **skel_p,
                                   const revision_t *revision,
                                   apr_pool_t *pool)
 {
- skel_t *skel;
+ svn_skel_t *skel;

  /* Create the skel. */
  skel = svn_skel__make_empty_list(pool);
@@ -1004,12 +1004,12 @@ svn_fs_base__unparse_revision_skel(skel_

 svn_error_t *
-svn_fs_base__unparse_transaction_skel(skel_t **skel_p,
+svn_fs_base__unparse_transaction_skel(svn_skel_t **skel_p,
                                      const transaction_t *transaction,
                                      apr_pool_t *pool)
 {
- skel_t *skel;
- skel_t *proplist_skel, *copies_skel, *header_skel;
+ svn_skel_t *skel;
+ svn_skel_t *proplist_skel, *copies_skel, *header_skel;
  svn_string_t *id_str;
  transaction_kind_t kind;

@@ -1096,11 +1096,11 @@ svn_fs_base__unparse_transaction_skel(sk

 static svn_error_t *
-prepend_checksum(skel_t *skel,
+prepend_checksum(svn_skel_t *skel,
                 svn_checksum_t *checksum,
                 apr_pool_t *pool)
 {
- skel_t *checksum_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *checksum_skel = svn_skel__make_empty_list(pool);

  switch (checksum->kind)
    {
@@ -1128,13 +1128,13 @@ prepend_checksum(skel_t *skel,

 svn_error_t *
-svn_fs_base__unparse_representation_skel(skel_t **skel_p,
+svn_fs_base__unparse_representation_skel(svn_skel_t **skel_p,
                                         const representation_t *rep,
                                         int format,
                                         apr_pool_t *pool)
 {
- skel_t *skel = svn_skel__make_empty_list(pool);
- skel_t *header_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *header_skel = svn_skel__make_empty_list(pool);

  /** Some parts of the header are common to all representations; do
      those parts first. **/
@@ -1189,9 +1189,9 @@ svn_fs_base__unparse_representation_skel
      /* Loop backwards through the windows, creating and prepending skels.
*/
      for (i = chunks->nelts; i > 0; i--)
        {
- skel_t *window_skel = svn_skel__make_empty_list(pool);
- skel_t *chunk_skel = svn_skel__make_empty_list(pool);
- skel_t *diff_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *window_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *chunk_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *diff_skel = svn_skel__make_empty_list(pool);
          const char *size_str, *offset_str, *version_str;
          rep_delta_chunk_t *chunk = APR_ARRAY_IDX(chunks, i - 1,
                                                   rep_delta_chunk_t *);
@@ -1252,13 +1252,13 @@ svn_fs_base__unparse_representation_skel

 svn_error_t *
-svn_fs_base__unparse_node_revision_skel(skel_t **skel_p,
+svn_fs_base__unparse_node_revision_skel(svn_skel_t **skel_p,
                                        const node_revision_t *noderev,
                                        int format,
                                        apr_pool_t *pool)
 {
- skel_t *skel;
- skel_t *header_skel;
+ svn_skel_t *skel;
+ svn_skel_t *header_skel;
  const char *num_str;

  /* Create the skel. */
@@ -1329,7 +1329,7 @@ svn_fs_base__unparse_node_revision_skel(
  if ((noderev->data_key_uniquifier) && (*noderev->data_key_uniquifier))
    {
      /* Build a 2-tuple with a rep key and uniquifier. */
- skel_t *data_key_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *data_key_skel = svn_skel__make_empty_list(pool);

      /* DATA-KEY-UNIQID */
      svn_skel__prepend(svn_skel__str_atom(noderev->data_key_uniquifier,
@@ -1373,11 +1373,11 @@ svn_fs_base__unparse_node_revision_skel(

 svn_error_t *
-svn_fs_base__unparse_copy_skel(skel_t **skel_p,
+svn_fs_base__unparse_copy_skel(svn_skel_t **skel_p,
                               const copy_t *copy,
                               apr_pool_t *pool)
 {
- skel_t *skel;
+ svn_skel_t *skel;
  svn_string_t *tmp_str;

  /* Create the skel. */
@@ -1415,11 +1415,11 @@ svn_fs_base__unparse_copy_skel(skel_t **

 svn_error_t *
-svn_fs_base__unparse_entries_skel(skel_t **skel_p,
+svn_fs_base__unparse_entries_skel(svn_skel_t **skel_p,
                                  apr_hash_t *entries,
                                  apr_pool_t *pool)
 {
- skel_t *skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *skel = svn_skel__make_empty_list(pool);
  apr_hash_index_t *hi;

  /* Create the skel. */
@@ -1433,7 +1433,7 @@ svn_fs_base__unparse_entries_skel(skel_t
          apr_ssize_t klen;
          svn_fs_id_t *value;
          svn_string_t *id_str;
- skel_t *entry_skel = svn_skel__make_empty_list(pool);
+ svn_skel_t *entry_skel = svn_skel__make_empty_list(pool);

          apr_hash_this(hi, &key, &klen, &val);
          value = val;
@@ -1459,11 +1459,11 @@ svn_fs_base__unparse_entries_skel(skel_t

 svn_error_t *
-svn_fs_base__unparse_change_skel(skel_t **skel_p,
+svn_fs_base__unparse_change_skel(svn_skel_t **skel_p,
                                 const change_t *change,
                                 apr_pool_t *pool)
 {
- skel_t *skel;
+ svn_skel_t *skel;
  svn_string_t *tmp_str;
  svn_fs_path_change_kind_t kind;

@@ -1532,11 +1532,11 @@ svn_fs_base__unparse_change_skel(skel_t

 svn_error_t *
-svn_fs_base__unparse_lock_skel(skel_t **skel_p,
+svn_fs_base__unparse_lock_skel(svn_skel_t **skel_p,
                               const svn_lock_t *lock,
                               apr_pool_t *pool)
 {
- skel_t *skel;
+ svn_skel_t *skel;

  /* Create the skel. */
  skel = svn_skel__make_empty_list(pool);

Modified: trunk/subversion/libsvn_fs_base/util/fs_skels.h
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_base/util/fs_skels.h?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_fs_base/util/fs_skels.h Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/libsvn_fs_base/util/fs_skels.h Wed Dec 24 09:36:34
2008 (r34926)
@@ -43,21 +43,21 @@ extern "C" {
   POOL for all allocations. */
 svn_error_t *
 svn_fs_base__parse_proplist_skel(apr_hash_t **proplist_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                 apr_pool_t *pool);

 /* Parse a `REVISION' SKEL into *REVISION_P. Use POOL for all
   allocations. */
 svn_error_t *
 svn_fs_base__parse_revision_skel(revision_t **revision_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                 apr_pool_t *pool);

 /* Parse a `TRANSACTION' SKEL into *TRANSACTION_P. Use POOL for all
   allocations. */
 svn_error_t *
 svn_fs_base__parse_transaction_skel(transaction_t **transaction_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                    apr_pool_t *pool);

 /* Parse a `REPRESENTATION' SKEL into *REP_P. Use POOL for all
@@ -65,20 +65,20 @@ svn_fs_base__parse_transaction_skel(tran

 svn_error_t *
 svn_fs_base__parse_representation_skel(representation_t **rep_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                       apr_pool_t *pool);

 /* Parse a `NODE-REVISION' SKEL into *NODEREV_P. Use POOL for all
   allocations. */
 svn_error_t *
 svn_fs_base__parse_node_revision_skel(node_revision_t **noderev_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                      apr_pool_t *pool);

 /* Parse a `COPY' SKEL into *COPY_P. Use POOL for all allocations. */
 svn_error_t *
 svn_fs_base__parse_copy_skel(copy_t **copy_p,
- skel_t *skel,
+ svn_skel_t *skel,
                             apr_pool_t *pool);

 /* Parse an `ENTRIES' SKEL into *ENTRIES_P, which is a hash with const
@@ -87,19 +87,19 @@ svn_fs_base__parse_copy_skel(copy_t **co
   Use POOL for all allocations. */
 svn_error_t *
 svn_fs_base__parse_entries_skel(apr_hash_t **entries_p,
- skel_t *skel,
+ svn_skel_t *skel,
                                apr_pool_t *pool);

 /* Parse a `CHANGE' SKEL into *CHANGE_P. Use POOL for all allocations. */
 svn_error_t *
 svn_fs_base__parse_change_skel(change_t **change_p,
- skel_t *skel,
+ svn_skel_t *skel,
                               apr_pool_t *pool);

 /* Parse a `LOCK' SKEL into *LOCK_P. Use POOL for all allocations. */
 svn_error_t *
 svn_fs_base__parse_lock_skel(svn_lock_t **lock_p,
- skel_t *skel,
+ svn_skel_t *skel,
                             apr_pool_t *pool);

@@ -111,28 +111,28 @@ svn_fs_base__parse_lock_skel(svn_lock_t
   svn_stringbuf_t * values) into a `PROPLIST' skel *SKEL_P. Use POOL
   for all allocations. */
 svn_error_t *
-svn_fs_base__unparse_proplist_skel(skel_t **skel_p,
+svn_fs_base__unparse_proplist_skel(svn_skel_t **skel_p,
                                   apr_hash_t *proplist,
                                   apr_pool_t *pool);

 /* Unparse REVISION into a `REVISION' skel *SKEL_P. Use POOL for all
   allocations. */
 svn_error_t *
-svn_fs_base__unparse_revision_skel(skel_t **skel_p,
+svn_fs_base__unparse_revision_skel(svn_skel_t **skel_p,
                                   const revision_t *revision,
                                   apr_pool_t *pool);

 /* Unparse TRANSACTION into a `TRANSACTION' skel *SKEL_P. Use POOL
   for all allocations. */
 svn_error_t *
-svn_fs_base__unparse_transaction_skel(skel_t **skel_p,
+svn_fs_base__unparse_transaction_skel(svn_skel_t **skel_p,
                                      const transaction_t *transaction,
                                      apr_pool_t *pool);

 /* Unparse REP into a `REPRESENTATION' skel *SKEL_P. Use POOL for all
   allocations. FORMAT is the format version of the filesystem. */
 svn_error_t *
-svn_fs_base__unparse_representation_skel(skel_t **skel_p,
+svn_fs_base__unparse_representation_skel(svn_skel_t **skel_p,
                                         const representation_t *rep,
                                         int format,
                                         apr_pool_t *pool);
@@ -140,7 +140,7 @@ svn_fs_base__unparse_representation_skel
 /* Unparse NODEREV into a `NODE-REVISION' skel *SKEL_P. Use POOL for
   all allocations. FORMAT is the format version of the filesystem. */
 svn_error_t *
-svn_fs_base__unparse_node_revision_skel(skel_t **skel_p,
+svn_fs_base__unparse_node_revision_skel(svn_skel_t **skel_p,
                                        const node_revision_t *noderev,
                                        int format,
                                        apr_pool_t *pool);
@@ -148,7 +148,7 @@ svn_fs_base__unparse_node_revision_skel(
 /* Unparse COPY into a `COPY' skel *SKEL_P. Use POOL for all
   allocations. */
 svn_error_t *
-svn_fs_base__unparse_copy_skel(skel_t **skel_p,
+svn_fs_base__unparse_copy_skel(svn_skel_t **skel_p,
                               const copy_t *copy,
                               apr_pool_t *pool);

@@ -156,21 +156,21 @@ svn_fs_base__unparse_copy_skel(skel_t **
   name) and svn_fs_id_t * values (the node-id of the entry) into an
   `ENTRIES' skel *SKEL_P. Use POOL for all allocations. */
 svn_error_t *
-svn_fs_base__unparse_entries_skel(skel_t **skel_p,
+svn_fs_base__unparse_entries_skel(svn_skel_t **skel_p,
                                  apr_hash_t *entries,
                                  apr_pool_t *pool);

 /* Unparse CHANGE into a `CHANGE' skel *SKEL_P. Use POOL for all
   allocations. */
 svn_error_t *
-svn_fs_base__unparse_change_skel(skel_t **skel_p,
+svn_fs_base__unparse_change_skel(svn_skel_t **skel_p,
                                 const change_t *change,
                                 apr_pool_t *pool);

 /* Unparse LOCK into a `LOCK' skel *SKEL_P. Use POOL for all
   allocations. */
 svn_error_t *
-svn_fs_base__unparse_lock_skel(skel_t **skel_p,
+svn_fs_base__unparse_lock_skel(svn_skel_t **skel_p,
                               const svn_lock_t *lock,
                               apr_pool_t *pool);

Modified: trunk/subversion/libsvn_subr/skel.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/skel.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/libsvn_subr/skel.c Wed Dec 24 08:16:19 2008
 (r34925)
+++ trunk/subversion/libsvn_subr/skel.c Wed Dec 24 09:36:34 2008
 (r34926)
@@ -165,17 +165,17 @@ putsize(char *data, apr_size_t len, apr_

-static skel_t *parse(const char *data, apr_size_t len,
- apr_pool_t *pool);
-static skel_t *list(const char *data, apr_size_t len,
- apr_pool_t *pool);
-static skel_t *implicit_atom(const char *data, apr_size_t len,
- apr_pool_t *pool);
-static skel_t *explicit_atom(const char *data, apr_size_t len,
- apr_pool_t *pool);
+static svn_skel_t *parse(const char *data, apr_size_t len,
+ apr_pool_t *pool);
+static svn_skel_t *list(const char *data, apr_size_t len,
+ apr_pool_t *pool);
+static svn_skel_t *implicit_atom(const char *data, apr_size_t len,
+ apr_pool_t *pool);
+static svn_skel_t *explicit_atom(const char *data, apr_size_t len,
+ apr_pool_t *pool);

-skel_t *
+svn_skel_t *
 svn_skel__parse(const char *data,
                apr_size_t len,
                apr_pool_t *pool)
@@ -185,7 +185,7 @@ svn_skel__parse(const char *data,

 /* Parse any kind of skel object --- atom, or list. */
-static skel_t *
+static svn_skel_t *
 parse(const char *data,
      apr_size_t len,
      apr_pool_t *pool)
@@ -213,7 +213,7 @@ parse(const char *data,
 }

-static skel_t *
+static svn_skel_t *
 list(const char *data,
     apr_size_t len,
     apr_pool_t *pool)
@@ -235,12 +235,12 @@ list(const char *data,

  /* Parse the children. */
  {
- skel_t *children = NULL;
- skel_t **tail = &children;
+ svn_skel_t *children = NULL;
+ svn_skel_t **tail = &children;

    for (;;)
      {
- skel_t *element;
+ svn_skel_t *element;

        /* Skip any whitespace. */
        while (data < end
@@ -274,7 +274,7 @@ list(const char *data,

    /* Construct the return value. */
    {
- skel_t *s = apr_pcalloc(pool, sizeof(*s));
+ svn_skel_t *s = apr_pcalloc(pool, sizeof(*s));

      s->is_atom = FALSE;
      s->data = list_start;
@@ -289,14 +289,14 @@ list(const char *data,

 /* Parse an atom with implicit length --- one that starts with a name
   character, terminated by whitespace, '(', ')', or end-of-data. */
-static skel_t *
+static svn_skel_t *
 implicit_atom(const char *data,
              apr_size_t len,
              apr_pool_t *pool)
 {
  const char *start = data;
  const char *end = data + len;
- skel_t *s;
+ svn_skel_t *s;

  /* Verify that the atom starts with a name character. At the
     moment, all callers have checked this already, but it's more
@@ -322,7 +322,7 @@ implicit_atom(const char *data,

 /* Parse an atom with explicit length --- one that starts with a byte
   length, as a decimal ASCII number. */
-static skel_t *
+static svn_skel_t *
 explicit_atom(const char *data,
              apr_size_t len,
              apr_pool_t *pool)
@@ -330,7 +330,7 @@ explicit_atom(const char *data,
  const char *end = data + len;
  const char *next;
  apr_size_t size;
- skel_t *s;
+ svn_skel_t *s;

  /* Parse the length. */
  size = getsize(data, end - data, &next, end - data);
@@ -362,14 +362,14 @@ explicit_atom(const char *data,

 /* Unparsing skeletons. */

-static apr_size_t estimate_unparsed_size(const skel_t *skel);
-static svn_stringbuf_t *unparse(const skel_t *skel,
+static apr_size_t estimate_unparsed_size(const svn_skel_t *skel);
+static svn_stringbuf_t *unparse(const svn_skel_t *skel,
                                svn_stringbuf_t *str,
                                apr_pool_t *pool);

 svn_stringbuf_t *
-svn_skel__unparse(const skel_t *skel, apr_pool_t *pool)
+svn_skel__unparse(const svn_skel_t *skel, apr_pool_t *pool)
 {
  svn_stringbuf_t *str;

@@ -389,7 +389,7 @@ svn_skel__unparse(const skel_t *skel, ap
   in pools, it's worth trying to get the buffer size right the first
   time. */
 static apr_size_t
-estimate_unparsed_size(const skel_t *skel)
+estimate_unparsed_size(const svn_skel_t *skel)
 {
  if (skel->is_atom)
    {
@@ -404,7 +404,7 @@ estimate_unparsed_size(const skel_t *ske
  else
    {
      int total_len;
- skel_t *child;
+ svn_skel_t *child;

      /* Allow space for opening and closing parens, and a space
         between each pair of elements. */
@@ -420,7 +420,7 @@ estimate_unparsed_size(const skel_t *ske
 /* Return non-zero iff we should use the implicit-length form for SKEL.
   Assume that SKEL is an atom. */
 static svn_boolean_t
-use_implicit(const skel_t *skel)
+use_implicit(const svn_skel_t *skel)
 {
  /* If it's null, or long, we should use explicit-length form. */
  if (skel->len == 0
@@ -452,7 +452,7 @@ use_implicit(const skel_t *skel)
 /* Append the concrete representation of SKEL to the string STR.
   Grow S with new space from POOL as necessary. */
 static svn_stringbuf_t *
-unparse(const skel_t *skel, svn_stringbuf_t *str, apr_pool_t *pool)
+unparse(const svn_skel_t *skel, svn_stringbuf_t *str, apr_pool_t *pool)
 {
  if (skel->is_atom)
    {
@@ -480,7 +480,7 @@ unparse(const skel_t *skel, svn_stringbu
  else
    {
      /* Append a list to STR. */
- skel_t *child;
+ svn_skel_t *child;

      /* Emit an opening parenthesis. */
      svn_stringbuf_ensure(str, str->len + 1);
@@ -509,10 +509,10 @@ unparse(const skel_t *skel, svn_stringbu
 /* Building skels. */

-skel_t *
+svn_skel_t *
 svn_skel__str_atom(const char *str, apr_pool_t *pool)
 {
- skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
+ svn_skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
  skel->is_atom = TRUE;
  skel->data = str;
  skel->len = strlen(str);
@@ -521,12 +521,12 @@ svn_skel__str_atom(const char *str, apr_
 }

-skel_t *
+svn_skel_t *
 svn_skel__mem_atom(const void *addr,
                   apr_size_t len,
                   apr_pool_t *pool)
 {
- skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
+ svn_skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
  skel->is_atom = TRUE;
  skel->data = addr;
  skel->len = len;
@@ -535,16 +535,16 @@ svn_skel__mem_atom(const void *addr,
 }

-skel_t *
+svn_skel_t *
 svn_skel__make_empty_list(apr_pool_t *pool)
 {
- skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
+ svn_skel_t *skel = apr_pcalloc(pool, sizeof(*skel));
  return skel;
 }

 void
-svn_skel__prepend(skel_t *skel, skel_t *list_skel)
+svn_skel__prepend(svn_skel_t *skel, svn_skel_t *list_skel)
 {
  /* If list_skel isn't even a list, somebody's not using this
     function properly. */
@@ -560,7 +560,7 @@ svn_skel__prepend(skel_t *skel, skel_t *

 svn_boolean_t
-svn_skel__matches_atom(const skel_t *skel, const char *str)
+svn_skel__matches_atom(const svn_skel_t *skel, const char *str)
 {
  if (skel && skel->is_atom)
    {
@@ -574,10 +574,10 @@ svn_skel__matches_atom(const skel_t *ske

 int
-svn_skel__list_length(const skel_t *skel)
+svn_skel__list_length(const svn_skel_t *skel)
 {
  int len = 0;
- const skel_t *child;
+ const svn_skel_t *child;

  if ((! skel) || skel->is_atom)
    return -1;

Modified: trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c Wed Dec 24
08:16:19 2008 (r34925)
+++ trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c Wed Dec 24
09:36:34 2008 (r34926)
@@ -41,7 +41,7 @@ struct rep_args
 {
  const char *key;
  svn_fs_t *fs;
- skel_t *skel;
+ svn_skel_t *skel;
 };

Modified: trunk/subversion/tests/libsvn_subr/skel-test.c
URL:
http://svn.collab.net/viewvc/svn/trunk/subversion/tests/libsvn_subr/skel-test.c?pathrev=34926&r1=34925&r2=34926
==============================================================================
--- trunk/subversion/tests/libsvn_subr/skel-test.c Wed Dec 24 08:16:19
2008 (r34925)
+++ trunk/subversion/tests/libsvn_subr/skel-test.c Wed Dec 24 09:36:34
2008 (r34926)
@@ -58,7 +58,7 @@ get_empty_string(apr_pool_t *pool)
 }

 /* Parse a skeleton from a Subversion string. */
-static skel_t *
+static svn_skel_t *
 parse_str(svn_stringbuf_t *str, apr_pool_t *pool)
 {
  return svn_skel__parse(str->data, str->len, pool);
@@ -66,7 +66,7 @@ parse_str(svn_stringbuf_t *str, apr_pool

 /* Parse a skeleton from a C string. */
-static skel_t *
+static svn_skel_t *
 parse_cstr(const char *str, apr_pool_t *pool)
 {
  return svn_skel__parse(str, strlen(str), pool);
@@ -155,7 +155,7 @@ skel_is_name(char byte)
 /* Check that SKEL is an atom, and its contents match LEN bytes of
   DATA. */
 static int
-check_atom(skel_t *skel, const char *data, apr_size_t len)
+check_atom(svn_skel_t *skel, const char *data, apr_size_t len)
 {
  return (skel
          && skel->is_atom
@@ -188,7 +188,7 @@ put_implicit_length_byte(svn_stringbuf_t
 /* Return true iff SKEL is the parsed form of the atom produced by
   calling put_implicit_length with BYTE. */
 static int
-check_implicit_length_byte(skel_t *skel, char byte)
+check_implicit_length_byte(svn_skel_t *skel, char byte)
 {
  if (! skel_is_name(byte))
    abort();
@@ -241,7 +241,7 @@ put_implicit_length_all_chars(svn_string
 /* Return true iff SKEL is the parsed form of the atom produced by
   calling put_implicit_length_all_chars. */
 static int
-check_implicit_length_all_chars(skel_t *skel)
+check_implicit_length_all_chars(svn_skel_t *skel)
 {
  apr_size_t len;
  char *name = gen_implicit_length_all_chars(&len);
@@ -260,7 +260,7 @@ parse_implicit_length(const char **msg,
                      apr_pool_t *pool)
 {
  svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
+ svn_skel_t *skel;

  *msg = "parse implicit-length atoms";

@@ -329,7 +329,7 @@ put_explicit_length(svn_stringbuf_t *str
 /* Return true iff SKEL is the parsed form of an atom generated by
   put_explicit_length. */
 static int
-check_explicit_length(skel_t *skel, const char *data, apr_size_t len)
+check_explicit_length(svn_skel_t *skel, const char *data, apr_size_t len)
 {
  return check_atom(skel, data, len);
 }
@@ -343,7 +343,7 @@ try_explicit_length(const char *data, ap
 {
  int i;
  svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
+ svn_skel_t *skel;

  /* Try it with every possible separator character. */
  for (i = 0; i < 256; i++)
@@ -440,7 +440,7 @@ parse_invalid_atoms(const char **msg,
    {
      if (ia->type == 1)
        {
- skel_t *skel = parse_cstr(ia->data, pool);
+ svn_skel_t *skel = parse_cstr(ia->data, pool);
          if (check_atom(skel, ia->data, ia->len))
            return fail(pool,
                        "failed to detect parsing error in '%s'", ia->data);
@@ -498,10 +498,10 @@ put_list_end(svn_stringbuf_t *str, char

 /* Return true iff SKEL is a list of length DESIRED_LEN. */
 static int
-check_list(skel_t *skel, int desired_len)
+check_list(svn_skel_t *skel, int desired_len)
 {
  int len;
- skel_t *child;
+ svn_skel_t *child;

  if (! (skel
         && ! skel->is_atom))
@@ -560,8 +560,8 @@ parse_list(const char **msg,
                      {
                        int i;
                        svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
- skel_t *child;
+ svn_skel_t *skel;
+ svn_skel_t *child;

                        put_list_start(str, (apr_byte_t)sep, sep_count);
                        for (i = 0; i < list_len; i++)
@@ -587,8 +587,8 @@ parse_list(const char **msg,
                  {
                    int i;
                    svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
- skel_t *child;
+ svn_skel_t *skel;
+ svn_skel_t *child;

                    put_list_start(str, (apr_byte_t)sep, sep_count);
                    for (i = 0; i < list_len; i++)
@@ -611,8 +611,8 @@ parse_list(const char **msg,
                    {
                      int i;
                      svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
- skel_t *child;
+ svn_skel_t *skel;
+ svn_skel_t *child;
                      char buf[1];

                      buf[0] = atom_byte;
@@ -637,8 +637,8 @@ parse_list(const char **msg,
                  {
                    int i;
                    svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *skel;
- skel_t *child;
+ svn_skel_t *skel;
+ svn_skel_t *child;
                    char data[256];

                    for (i = 0; i < 256; i++)
@@ -712,11 +712,11 @@ parse_list(const char **msg,
 /* Building interesting skels. */

 /* Build an atom skel containing the LEN bytes at DATA. */
-static skel_t *
+static svn_skel_t *
 build_atom(apr_size_t len, char *data, apr_pool_t *pool)
 {
  char *copy = apr_palloc(pool, len);
- skel_t *skel = apr_palloc(pool, sizeof(*skel));
+ svn_skel_t *skel = apr_palloc(pool, sizeof(*skel));

  memcpy(copy, data, len);
  skel->is_atom = 1;
@@ -727,10 +727,10 @@ build_atom(apr_size_t len, char *data, a
 }

 /* Build an empty list skel. */
-static skel_t *
+static svn_skel_t *
 empty(apr_pool_t *pool)
 {
- skel_t *skel = apr_palloc(pool, sizeof(*skel));
+ svn_skel_t *skel = apr_palloc(pool, sizeof(*skel));

  skel->is_atom = 0;
  skel->children = 0;
@@ -740,7 +740,7 @@ empty(apr_pool_t *pool)

 /* Stick ELEMENT at the beginning of the list skeleton LIST. */
 static void
-add(skel_t *element, skel_t *list)
+add(svn_skel_t *element, svn_skel_t *list)
 {
  element->next = list->children;
  list->children = element;
@@ -750,7 +750,7 @@ add(skel_t *element, skel_t *list)
 /* Return true if the contents of skel A are identical to those of
   skel B. */
 static int
-skel_equal(skel_t *a, skel_t *b)
+skel_equal(svn_skel_t *a, svn_skel_t *b)
 {
  if (a->is_atom != b->is_atom)
    return 0;
@@ -760,7 +760,7 @@ skel_equal(skel_t *a, skel_t *b)
            && ! memcmp(a->data, b->data, a->len));
  else
    {
- skel_t *a_child, *b_child;
+ svn_skel_t *a_child, *b_child;

      for (a_child = a->children, b_child = b->children;
           a_child && b_child;
@@ -798,7 +798,7 @@ unparse_implicit_length(const char **msg
        {
          svn_stringbuf_t *str = get_empty_string(pool);
          char buf = (char)byte;
- skel_t *skel = build_atom(1, &buf, pool);
+ svn_skel_t *skel = build_atom(1, &buf, pool);

          str = svn_skel__unparse(skel, pool);

@@ -832,8 +832,8 @@ unparse_list(const char **msg,
  {
    svn_stringbuf_t *str = get_empty_string(pool);
    int byte;
- skel_t *list = empty(pool);
- skel_t *reparsed, *elt;
+ svn_skel_t *list = empty(pool);
+ svn_skel_t *reparsed, *elt;

    for (byte = 0; byte < 256; byte++)
      if (skel_is_name( (apr_byte_t)byte))
@@ -879,13 +879,13 @@ unparse_list(const char **msg,
  /* Make a list of lists. */
  {
    svn_stringbuf_t *str = get_empty_string(pool);
- skel_t *top = empty(pool);
- skel_t *reparsed;
+ svn_skel_t *top = empty(pool);
+ svn_skel_t *reparsed;
    int i;

    for (i = 0; i < 10; i++)
      {
- skel_t *middle = empty(pool);
+ svn_skel_t *middle = empty(pool);
        int j;

        for (j = 0; j < 10; j++)
Received on 2008-12-24 20:45:39 CET

This is an archived mail posted to the Subversion Dev mailing list.