Author: brane
Date: Wed Jan 14 03:31:51 2015
New Revision: 1651567

URL: http://svn.apache.org/r1651567
Log:
Perform runtime checks for the libsvn_fs_util version.
The various FS backends did not check the runtime version of the
utility library; this change makes the version checks more
complete and consistent.

* subversion/include/private/svn_fs_util.h: Include svn_version.h.
  (svn_fs_util__version): Declare new private API.
* subversion/libsvn_fs_util/fs-util.c
  (svn_fs_util__version): Implement.

* subversion/libsvn_fs_base/fs.c (svn_fs_base__init),
  subversion/libsvn_fs_fs/fs.c (svn_fs_fs__init),
  subversion/libsvn_fs_x/fs.c (svn_fs_x__init):
   Add svn_fs_util__version to the version chec list.

Modified:
    subversion/trunk/subversion/include/private/svn_fs_util.h
    subversion/trunk/subversion/libsvn_fs_base/fs.c
    subversion/trunk/subversion/libsvn_fs_fs/fs.c
    subversion/trunk/subversion/libsvn_fs_util/fs-util.c
    subversion/trunk/subversion/libsvn_fs_x/fs.c

Modified: subversion/trunk/subversion/include/private/svn_fs_util.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_util.h?rev=1651567&r1=1651566&r2=1651567&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_util.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_util.h Wed Jan 14 
03:31:51 2015
@@ -29,12 +29,17 @@
 
 #include "svn_types.h"
 #include "svn_error.h"
+#include "svn_version.h"
 #include "svn_fs.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+/* Get libsvn_fs_util version information. */
+const svn_version_t *
+svn_fs_util__version(void);
+
 /* Returns whether PATH is in canonical form as defined by
    svn_fs__canonicalize_abspath().
  */

Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1651567&r1=1651566&r2=1651567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Wed Jan 14 03:31:51 2015
@@ -1516,6 +1516,7 @@ svn_fs_base__init(const svn_version_t *l
     {
       { "svn_subr",  svn_subr_version },
       { "svn_delta", svn_delta_version },
+      { "svn_fs_util", svn_fs_util__version },
       { NULL, NULL }
     };
 

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1651567&r1=1651566&r2=1651567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Wed Jan 14 03:31:51 2015
@@ -597,6 +597,7 @@ svn_fs_fs__init(const svn_version_t *loa
     {
       { "svn_subr",  svn_subr_version },
       { "svn_delta", svn_delta_version },
+      { "svn_fs_util", svn_fs_util__version },
       { NULL, NULL }
     };
 

Modified: subversion/trunk/subversion/libsvn_fs_util/fs-util.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_util/fs-util.c?rev=1651567&r1=1651566&r2=1651567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_util/fs-util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_util/fs-util.c Wed Jan 14 03:31:51 
2015
@@ -38,6 +38,14 @@
 #include "private/svn_subr_private.h"
 #include "../libsvn_fs/fs-loader.h"
 
+
+const svn_version_t *
+svn_fs_util__version(void)
+{
+  SVN_VERSION_BODY;
+}
+
+
 /* Return TRUE, if PATH of PATH_LEN > 0 chars starts with a '/' and does
  * not end with a '/' and does not contain duplicate '/'.
  */

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1651567&r1=1651566&r2=1651567&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Wed Jan 14 03:31:51 2015
@@ -613,6 +613,7 @@ svn_fs_x__init(const svn_version_t *load
     {
       { "svn_subr",  svn_subr_version },
       { "svn_delta", svn_delta_version },
+      { "svn_fs_util", svn_fs_util__version },
       { NULL, NULL }
     };
 


Reply via email to