subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1466936 - in /subversion/trunk/subversion: bindings/swig/include/svn_types.swg include/svn_fs.h include/svn_repos.h libsvn_fs/fs-loader.c libsvn_fs/fs-loader.h libsvn_fs_base/fs.c libsvn_fs_fs/fs.c libsvn_repos/repos.c
Date Thu, 11 Apr 2013 16:06:13 GMT
Author: julianfoad
Date: Thu Apr 11 16:06:13 2013
New Revision: 1466936

URL: http://svn.apache.org/r1466936
Log:
Rename the callback parameters in the repository 'freeze' APIs to match the
style used elsewhere -- that is, *_func and *_baton.

* subversion/include/svn_fs.h,
  subversion/libsvn_fs/fs-loader.c
  (svn_fs_freeze): Rename the callback function and baton as above.

* subversion/include/svn_repos.h
  (svn_repos_freeze): Same.

* subversion/libsvn_repos/repos.c
  (freeze_baton_t, multi_freeze, svn_repos_freeze): Same.

* subversion/libsvn_fs_base/fs.c
  (base_bdb_freeze): Same.

* subversion/libsvn_fs_fs/fs.c
  (fs_freeze_baton_t, fs_freeze_body, fs_freeze): Same.

* subversion/libsvn_fs/fs-loader.h
  (fs_vtable_t): Same for the 'freeze' method.

* subversion/bindings/swig/include/svn_types.swg
  (typemap for svn_repos_freeze_func_t): Same.

Modified:
    subversion/trunk/subversion/bindings/swig/include/svn_types.swg
    subversion/trunk/subversion/include/svn_fs.h
    subversion/trunk/subversion/include/svn_repos.h
    subversion/trunk/subversion/libsvn_fs/fs-loader.c
    subversion/trunk/subversion/libsvn_fs/fs-loader.h
    subversion/trunk/subversion/libsvn_fs_base/fs.c
    subversion/trunk/subversion/libsvn_fs_fs/fs.c
    subversion/trunk/subversion/libsvn_repos/repos.c

Modified: subversion/trunk/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_types.swg?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_types.swg Thu Apr 11 16:06:13 2013
@@ -909,7 +909,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
    Callback: svn_repos_freeze_func_t
 */
 #ifdef SWIGPYTHON
-%typemap(in) (svn_repos_freeze_func_t freeze_body, void *baton)
+%typemap(in) (svn_repos_freeze_func_t freeze_func, void *freeze_baton)
 {
   $1 = svn_swig_py_repos_freeze_func;
   $2 = (void *)$input;

Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Thu Apr 11 16:06:13 2013
@@ -420,7 +420,7 @@ svn_fs_recover(const char *path,
 
 /**
  * Take an exclusive lock on @a fs to prevent commits and then invoke
- * @a freeze_body passing @a baton.
+ * @a freeze_func passing @a freeze_baton.
  *
  * @note The BDB backend doesn't implement this feature so most
  * callers should not call this function directly but should use the
@@ -432,10 +432,9 @@ svn_fs_recover(const char *path,
  */
 svn_error_t *
 svn_fs_freeze(svn_fs_t *fs,
-              svn_error_t *(*freeze_body)(void *baton, apr_pool_t *pool),
-              void *baton,
+              svn_error_t *(*freeze_func)(void *baton, apr_pool_t *pool),
+              void *freeze_baton,
               apr_pool_t *pool);
-              
 
 
 /** Subversion filesystems based on Berkeley DB.

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Thu Apr 11 16:06:13 2013
@@ -695,7 +695,7 @@ typedef svn_error_t *(*svn_repos_freeze_
 /**
  * Take an exclusive lock on each of the repositories in @a paths to
  * prevent commits and then while holding all the locks invoke @a
- * freeze_body passing @a baton.  Each repository may be readable by
+ * freeze_func passing @a freeze_baton.  Each repository may be readable by
  * Subversion while frozen, or may be unreadable, depending on which
  * FS backend the repository uses.  Repositories are locked in the
  * order in which they are specified in the array.
@@ -709,8 +709,8 @@ typedef svn_error_t *(*svn_repos_freeze_
  */
 svn_error_t *
 svn_repos_freeze(apr_array_header_t *paths,
-                 svn_repos_freeze_func_t freeze_body,
-                 void *baton,
+                 svn_repos_freeze_func_t freeze_func,
+                 void *freeze_baton,
                  apr_pool_t *pool);
 
 /** This function is a wrapper around svn_fs_berkeley_logfiles(),

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Thu Apr 11 16:06:13 2013
@@ -644,11 +644,11 @@ svn_fs_verify_root(svn_fs_root_t *root,
 
 svn_error_t *
 svn_fs_freeze(svn_fs_t *fs,
-              svn_error_t *(*freeze_body)(void *baton, apr_pool_t *pool),
-              void *baton,
+              svn_error_t *(*freeze_func)(void *baton, apr_pool_t *pool),
+              void *freeze_baton,
               apr_pool_t *pool)
 {
-  SVN_ERR(fs->vtable->freeze(fs, freeze_body, baton, pool));
+  SVN_ERR(fs->vtable->freeze(fs, freeze_func, freeze_baton, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Thu Apr 11 16:06:13 2013
@@ -224,8 +224,8 @@ typedef struct fs_vtable_t
   svn_error_t *(*verify_root)(svn_fs_root_t *root,
                               apr_pool_t *pool);
   svn_error_t *(*freeze)(svn_fs_t *fs,
-                         svn_error_t *(*freeze_body)(void *, apr_pool_t *),
-                         void *baton, apr_pool_t *pool);
+                         svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+                         void *freeze_baton, apr_pool_t *pool);
   svn_error_t *(*bdb_set_errcall)(svn_fs_t *fs,
                                   void (*handler)(const char *errpfx,
                                                   char *msg));

Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Thu Apr 11 16:06:13 2013
@@ -533,8 +533,8 @@ base_bdb_verify_root(svn_fs_root_t *root
 
 static svn_error_t *
 base_bdb_freeze(svn_fs_t *fs,
-                svn_error_t *(*freeze_body)(void *, apr_pool_t *),
-                void *baton,
+                svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+                void *freeze_baton,
                 apr_pool_t *pool)
 {
   SVN__NOT_IMPLEMENTED();

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Thu Apr 11 16:06:13 2013
@@ -126,8 +126,8 @@ fs_set_errcall(svn_fs_t *fs,
 
 struct fs_freeze_baton_t {
   svn_fs_t *fs;
-  svn_error_t *(*freeze_body)(void *, apr_pool_t *);
-  void *baton;
+  svn_error_t *(*freeze_func)(void *, apr_pool_t *);
+  void *freeze_baton;
 };
 
 static svn_error_t *
@@ -141,22 +141,22 @@ fs_freeze_body(void *baton,
   if (exists)
     SVN_ERR(svn_fs_fs__lock_rep_cache(b->fs, pool));
 
-  SVN_ERR(b->freeze_body(b->baton, pool));
+  SVN_ERR(b->freeze_func(b->freeze_baton, pool));
 
   return SVN_NO_ERROR;
 }
 
 static svn_error_t *
 fs_freeze(svn_fs_t *fs,
-          svn_error_t *(*freeze_body)(void *, apr_pool_t *),
-          void *baton,
+          svn_error_t *(*freeze_func)(void *, apr_pool_t *),
+          void *freeze_baton,
           apr_pool_t *pool)
 {
   struct fs_freeze_baton_t b;
 
   b.fs = fs;
-  b.freeze_body = freeze_body;
-  b.baton = baton;
+  b.freeze_func = freeze_func;
+  b.freeze_baton = freeze_baton;
 
   SVN_ERR(svn_fs__check_fs(fs, TRUE));
   SVN_ERR(svn_fs_fs__with_write_lock(fs, fs_freeze_body, &b, pool));

Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1466936&r1=1466935&r2=1466936&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Thu Apr 11 16:06:13 2013
@@ -1813,8 +1813,8 @@ svn_repos_recover4(const char *path,
 struct freeze_baton_t {
   apr_array_header_t *paths;
   int counter;
-  svn_repos_freeze_func_t freeze_body;
-  void *baton;
+  svn_repos_freeze_func_t freeze_func;
+  void *freeze_baton;
 };
 
 static svn_error_t *
@@ -1825,7 +1825,7 @@ multi_freeze(void *baton,
 
   if (fb->counter == fb->paths->nelts)
     {
-      SVN_ERR(fb->freeze_body(fb->baton, pool));
+      SVN_ERR(fb->freeze_func(fb->freeze_baton, pool));
       return SVN_NO_ERROR;
     }
   else
@@ -1874,16 +1874,16 @@ multi_freeze(void *baton,
    while frozen. */
 svn_error_t *
 svn_repos_freeze(apr_array_header_t *paths,
-                 svn_repos_freeze_func_t freeze_body,
-                 void *baton,
+                 svn_repos_freeze_func_t freeze_func,
+                 void *freeze_baton,
                  apr_pool_t *pool)
 {
   struct freeze_baton_t fb;
 
   fb.paths = paths;
   fb.counter = 0;
-  fb.freeze_body = freeze_body;
-  fb.baton = baton;
+  fb.freeze_func = freeze_func;
+  fb.freeze_baton = freeze_baton;
 
   SVN_ERR(multi_freeze(&fb, pool));
 



Mime
View raw message