svn commit: r1649034 - in /subversion/trunk/subversion/libsvn_fs_x: fs.c fs.h transaction.c

[st...@apache.org]

Author: stefan2
Date: Fri Jan  2 14:11:04 2015
New Revision: 1649034

URL: http://svn.apache.org/r1649034
Log:
In FSX, continue renaming global structs to meet our coding guidelines.
This is part of a series of search-replace changes.

* subversion/libsvn_fs_x/fs.h
  (fs_x_shared_data_t): Rename to ...
  (svn_fs_x__shared_data_t): ... this.
  (fs_x_data_t): Update reference.

* subversion/libsvn_fs_x/fs.c
* subversion/libsvn_fs_x/transaction.c:
  (): s/fs_x_shared_data_t/svn_fs_x__shared_data_t/g

Modified:
    subversion/trunk/subversion/libsvn_fs_x/fs.c
    subversion/trunk/subversion/libsvn_fs_x/fs.h
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1649034&r1=1649033&r2=1649034&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Fri Jan  2 14:11:04 2015
@@ -66,7 +66,7 @@ x_serialized_init(svn_fs_t *fs, apr_pool
   fs_x_data_t *ffd = fs->fsap_data;
   const char *key;
   void *val;
-  fs_x_shared_data_t *ffsd;
+  svn_fs_x__shared_data_t *ffsd;
   apr_status_t status;
 
   /* Note that we are allocating a small amount of long-lived data for

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649034&r1=1649033&r2=1649034&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan  2 14:11:04 2015
@@ -163,7 +163,7 @@ typedef struct svn_fs_x__shared_txn_data
 /* Private FSX-specific data shared between all svn_fs_t objects that
    relate to a particular filesystem, as identified by filesystem UUID.
    Objects of this type are allocated in the common pool. */
-typedef struct fs_x_shared_data_t
+typedef struct svn_fs_x__shared_data_t
 {
   /* A list of shared transaction objects for each transaction that is
      currently active, or NULL if none are.  All access to this list,
@@ -199,7 +199,7 @@ typedef struct fs_x_shared_data_t
   /* The common pool, under which this object is allocated, subpools
      of which are used to allocate the transaction objects. */
   apr_pool_t *common_pool;
-} fs_x_shared_data_t;
+} svn_fs_x__shared_data_t;
 
 /* Data structure for the 1st level DAG node cache. */
 typedef struct fs_x_dag_cache_t fs_x_dag_cache_t;
@@ -372,7 +372,7 @@ typedef struct fs_x_data_t
   svn_boolean_t has_write_lock;
 
   /* Data shared between all svn_fs_t objects for a given filesystem. */
-  fs_x_shared_data_t *shared;
+  svn_fs_x__shared_data_t *shared;
 
   /* The sqlite database used for rep caching. */
   svn_sqlite__db_t *rep_cache_db;

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649034&r1=1649033&r2=1649034&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan  2 14:11:04 2015
@@ -91,7 +91,7 @@ get_shared_txn(svn_fs_t *fs,
                svn_boolean_t create_new)
 {
   fs_x_data_t *ffd = fs->fsap_data;
-  fs_x_shared_data_t *ffsd = ffd->shared;
+  svn_fs_x__shared_data_t *ffsd = ffd->shared;
   svn_fs_x__shared_txn_data_t *txn;
 
   for (txn = ffsd->txns; txn; txn = txn->next)
@@ -136,7 +136,7 @@ static void
 free_shared_txn(svn_fs_t *fs, svn_fs_x__txn_id_t txn_id)
 {
   fs_x_data_t *ffd = fs->fsap_data;
-  fs_x_shared_data_t *ffsd = ffd->shared;
+  svn_fs_x__shared_data_t *ffsd = ffd->shared;
   svn_fs_x__shared_txn_data_t *txn, *prev = NULL;
 
   for (txn = ffsd->txns; txn; prev = txn, txn = txn->next)
@@ -173,7 +173,7 @@ with_txnlist_lock(svn_fs_t *fs,
                   apr_pool_t *pool)
 {
   fs_x_data_t *ffd = fs->fsap_data;
-  fs_x_shared_data_t *ffsd = ffd->shared;
+  svn_fs_x__shared_data_t *ffsd = ffd->shared;
 
   SVN_MUTEX__WITH_LOCK(ffsd->txn_list_lock,
                        body(fs, baton, pool));
@@ -327,7 +327,7 @@ init_lock_baton(with_lock_baton_t *baton
                 lock_id_t lock_id)
 {
   fs_x_data_t *ffd = baton->fs->fsap_data;
-  fs_x_shared_data_t *ffsd = ffd->shared;
+  svn_fs_x__shared_data_t *ffsd = ffd->shared;
 
   switch (lock_id)
     {