You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/12/02 12:28:06 UTC

svn commit: r1717611 - in /subversion/branches/ra-git/subversion: libsvn_fs_git/git-fs.c libsvn_fs_git/git-revroot.c libsvn_ra_git/ra_plugin.c

Author: rhuijben
Date: Wed Dec  2 11:28:06 2015
New Revision: 1717611

URL: http://svn.apache.org/viewvc?rev=1717611&view=rev
Log:
On the ra-git branch: various minor (compilation fixes), following up
on recent changes.

* subversion/libsvn_fs_git/git-fs.c
  (fs_git_set_uuid): Fix call.

* subversion/libsvn_fs_git/git-revroot.c
  (root_vtable): Mark const.

* subversion/libsvn_ra_git/ra_plugin.c
  (ra_git_vtable): Fix function reference.

Modified:
    subversion/branches/ra-git/subversion/libsvn_fs_git/git-fs.c
    subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c
    subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c

Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/git-fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/git-fs.c?rev=1717611&r1=1717610&r2=1717611&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/git-fs.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/git-fs.c Wed Dec  2 11:28:06 2015
@@ -131,7 +131,7 @@ fs_git_set_uuid(svn_fs_t *fs, const char
 {
   SVN_ERR(svn_fs__check_fs(fs, TRUE));
 
-  SVN_ERR(svn_fs_git_db_set_uuid(fs, uuid, pool));
+  SVN_ERR(svn_fs_git__db_set_uuid(fs, uuid, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c?rev=1717611&r1=1717610&r2=1717611&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c Wed Dec  2 11:28:06 2015
@@ -1248,7 +1248,7 @@ fs_git_get_mergeinfo(svn_mergeinfo_catal
   return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, NULL);
 }
 
-static root_vtable_t root_vtable =
+static const root_vtable_t root_vtable =
 {
   fs_git_paths_changed,
   fs_git_check_path,

Modified: subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c?rev=1717611&r1=1717610&r2=1717611&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_ra_git/ra_plugin.c Wed Dec  2 11:28:06 2015
@@ -2482,7 +2482,7 @@ static const svn_ra__vtable_t ra_git_vta
   svn_ra_git__replay_range,
   svn_ra_git__get_deleted_rev,
   svn_ra_git__get_inherited_props,
-  svn_ra_git__set_ra_open,
+  svn_ra_git__set_svn_ra_open,
 
   svn_ra_git__register_editor_shim_callbacks,
   NULL /* get_commit_ev2 */,