You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/04/24 22:41:42 UTC

svn commit: r1471662 - in /subversion/trunk/subversion: include/svn_fs.h include/svn_repos.h libsvn_fs/fs-loader.c libsvn_repos/repos.c tests/libsvn_fs/fs-test.c tests/libsvn_fs_fs/fs-pack-test.c tests/libsvn_repos/repos-test.c

Author: danielsh
Date: Wed Apr 24 20:41:41 2013
New Revision: 1471662

URL: http://svn.apache.org/r1471662
Log:
Remove the '#ifdef SVN_FS_INFO' guards that hide the svn_fs_info* and
svn_repos_info* family of APIs.  All these APIs were developed on trunk,
so their names are not repeated in this log message.

Modified:
    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_repos/repos.c
    subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
    subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/trunk/subversion/tests/libsvn_repos/repos-test.c

Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Wed Apr 24 20:41:41 2013
@@ -2060,7 +2060,6 @@ svn_fs_youngest_rev(svn_revnum_t *younge
                     apr_pool_t *pool);
 
 
-#ifdef SVN_FS_INFO
 /**
  * Return filesystem format information for @a fs.
  *
@@ -2093,7 +2092,6 @@ svn_fs_info_config_files(apr_array_heade
                          svn_fs_t *fs,
                          apr_pool_t *result_pool,
                          apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
 
 
 
@@ -2560,7 +2558,6 @@ svn_fs_verify_root(svn_fs_root_t *root,
 
 /** @} */
 
-#ifdef SVN_FS_INFO
 /**
  * @defgroup fs_info Filesystem information subsystem
  * @{
@@ -2636,7 +2633,6 @@ svn_fs_info_dup(const void *info,
                 apr_pool_t *scratch_pool);
 
 /** @} */
-#endif /* SVN_FS_INFO */
 
 #ifdef __cplusplus
 }

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Wed Apr 24 20:41:41 2013
@@ -494,7 +494,6 @@ svn_repos_has_capability(svn_repos_t *re
                          const char *capability,
                          apr_pool_t *pool);
 
-#ifdef SVN_FS_INFO
 /**
  * Return a set capabilities supported by the running Subversion library and by
  * @a repos.  (Capabilities supported by this version of Subversion but not by
@@ -513,7 +512,6 @@ svn_repos_capabilities(apr_hash_t **capa
                        svn_repos_t *repos,
                        apr_pool_t *result_pool,
                        apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
 /** @} */
 
 /**
@@ -2488,7 +2486,6 @@ svn_repos_node_editor(const svn_delta_ed
 svn_repos_node_t *
 svn_repos_node_from_baton(void *edit_baton);
 
-#ifdef SVN_FS_INFO
 /**
  * Return repository format information for @a repos.
  *
@@ -2509,7 +2506,6 @@ svn_repos_info_format(int *repos_format,
                       svn_repos_t *repos,
                       apr_pool_t *result_pool,
                       apr_pool_t *scratch_pool);
-#endif /* SVN_FS_INFO */
 
 /** @} */
 

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Wed Apr 24 20:41:41 2013
@@ -1316,7 +1316,6 @@ svn_fs_youngest_rev(svn_revnum_t *younge
   return svn_error_trace(fs->vtable->youngest_rev(youngest_p, fs, pool));
 }
 
-#ifdef SVN_FS_INFO
 svn_error_t *
 svn_fs_info_format(int *fs_format,
                    svn_version_t **supports_version,
@@ -1339,7 +1338,6 @@ svn_fs_info_config_files(apr_array_heade
                                                        result_pool,
                                                        scratch_pool));
 }
-#endif
 
 svn_error_t *
 svn_fs_deltify_revision(svn_fs_t *fs, svn_revnum_t revision, apr_pool_t *pool)
@@ -1627,7 +1625,6 @@ svn_fs_version(void)
 }
 
 
-#ifdef SVN_FS_INFO
 /** info **/
 svn_error_t *
 svn_fs_info(const svn_fs_info_placeholder_t **info_p,
@@ -1665,5 +1662,4 @@ svn_fs_info_dup(const void *info_void,
   else
     return apr_pmemdup(result_pool, info, sizeof(*info));
 }
-#endif
 

Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Wed Apr 24 20:41:41 2013
@@ -1677,7 +1677,6 @@ svn_repos_has_capability(svn_repos_t *re
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
 svn_error_t *
 svn_repos_capabilities(apr_hash_t **capabilities,
                        svn_repos_t *repos,
@@ -1734,7 +1733,6 @@ svn_repos_info_format(int *repos_format,
 
   return SVN_NO_ERROR;
 }
-#endif
 
 svn_fs_t *
 svn_repos_fs(svn_repos_t *repos)

Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Wed Apr 24 20:41:41 2013
@@ -4984,7 +4984,6 @@ filename_trailing_newline(const svn_test
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
 static svn_error_t *
 test_fs_info_format(const svn_test_opts_t *opts,
                     apr_pool_t *pool)
@@ -5005,7 +5004,6 @@ test_fs_info_format(const svn_test_opts_
 
   return SVN_NO_ERROR;
 }
-#endif
 
 /* ------------------------------------------------------------------------ */
 
@@ -5089,9 +5087,7 @@ struct svn_test_descriptor_t test_funcs[
                        "test svn_fs_delete_fs"),
     SVN_TEST_OPTS_PASS(filename_trailing_newline,
                        "filenames with trailing \\n might be rejected"),
-#ifdef SVN_FS_INFO
     SVN_TEST_OPTS_PASS(test_fs_info_format,
                        "test svn_fs_info_format"),
-#endif
     SVN_TEST_NULL
   };

Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Wed Apr 24 20:41:41 2013
@@ -791,7 +791,6 @@ file_hint_at_shard_boundary(const svn_te
 #define REPO_NAME "test-repo-fsfs-info"
 #define SHARD_SIZE 3
 #define MAX_REV 5
-#ifdef SVN_FS_INFO
 static svn_error_t *
 test_info(const svn_test_opts_t *opts,
           apr_pool_t *pool)
@@ -828,7 +827,6 @@ test_info(const svn_test_opts_t *opts,
 
   return SVN_NO_ERROR;
 }
-#endif
 #undef REPO_NAME
 #undef SHARD_SIZE
 #undef MAX_REV
@@ -858,9 +856,7 @@ struct svn_test_descriptor_t test_funcs[
                        "recover a fully packed filesystem"),
     SVN_TEST_OPTS_PASS(file_hint_at_shard_boundary,
                        "test file hint at shard boundary"),
-#ifdef SVN_FS_INFO
     SVN_TEST_OPTS_PASS(test_info,
                        "test svn_fs_info"),
-#endif
     SVN_TEST_NULL
   };

Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1471662&r1=1471661&r2=1471662&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Wed Apr 24 20:41:41 2013
@@ -3259,7 +3259,6 @@ filename_with_control_chars(const svn_te
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN_FS_INFO
 static svn_error_t *
 test_repos_info(const svn_test_opts_t *opts,
                 apr_pool_t *pool)
@@ -3297,7 +3296,6 @@ test_repos_info(const svn_test_opts_t *o
 
   return SVN_NO_ERROR;
 }
-#endif
 
 
 /* The test table.  */
@@ -3345,9 +3343,7 @@ struct svn_test_descriptor_t test_funcs[
                        "test svn_repos_delete"),
     SVN_TEST_OPTS_PASS(filename_with_control_chars,
                        "test filenames with control characters"),
-#ifdef SVN_FS_INFO
     SVN_TEST_OPTS_PASS(test_repos_info,
                        "test svn_repos_info_*"),
-#endif
     SVN_TEST_NULL
   };