You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/10/27 09:51:10 UTC

svn commit: r1710747 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c

Author: ivan
Date: Tue Oct 27 08:51:09 2015
New Revision: 1710747

URL: http://svn.apache.org/viewvc?rev=1710747&view=rev
Log:
Use standard pattern for implementing deprecated functions.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_node_history): Implement via svn_fs_node_history2() instead of
   calling vtable member directly.
  (svn_fs_get_mergeinfo): Implement via svn_fs_get_mergeinfo2() instead of
   calling vtable member directly.
  (svn_fs_history_prev): Implement via svn_fs_history_prev2() instead of
   calling vtable member directly.

Modified:
    subversion/trunk/subversion/libsvn_fs/fs-loader.c

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1710747&r1=1710746&r2=1710747&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Oct 27 08:51:09 2015
@@ -1116,8 +1116,8 @@ svn_error_t *
 svn_fs_node_history(svn_fs_history_t **history_p, svn_fs_root_t *root,
                     const char *path, apr_pool_t *pool)
 {
-  return svn_error_trace(root->vtable->node_history(history_p, root, path,
-                                                    pool, pool));
+  return svn_error_trace(svn_fs_node_history2(history_p, root, path,
+                                              pool, pool));
 }
 
 svn_error_t *
@@ -1288,10 +1288,10 @@ svn_fs_get_mergeinfo(svn_mergeinfo_catal
                      svn_boolean_t include_descendants,
                      apr_pool_t *pool)
 {
-  return svn_error_trace(root->vtable->get_mergeinfo(catalog, root, paths,
-                                                     inherit,
-                                                     include_descendants,
-                                                     TRUE, pool, pool));
+  return svn_error_trace(svn_fs_get_mergeinfo2(catalog, root, paths,
+                                               inherit,
+                                               include_descendants,
+                                               TRUE, pool, pool));
 }
 
 svn_error_t *
@@ -1897,8 +1897,8 @@ svn_fs_history_prev(svn_fs_history_t **p
                     svn_fs_history_t *history, svn_boolean_t cross_copies,
                     apr_pool_t *pool)
 {
-  return svn_error_trace(history->vtable->prev(prev_history_p, history,
-                                               cross_copies, pool, pool));
+  return svn_error_trace(svn_fs_history_prev2(prev_history_p, history,
+                                              cross_copies, pool, pool));
 }
 
 svn_error_t *