You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/10/16 21:54:06 UTC

svn commit: r1532874 - /subversion/trunk/subversion/libsvn_repos/config_pool.c

Author: stefan2
Date: Wed Oct 16 19:54:05 2013
New Revision: 1532874

URL: http://svn.apache.org/r1532874
Log:
Effectively undo r1532730 and remove the bogus "return SVN_NO_ERROR"
line that slipped in accidentally -- probably while going through
the code and commenting everything properly.

* subversion/libsvn_repos/config_pool.c
  (find_repos_config): remove early return statement and re-enable
                       remaining code

Modified:
    subversion/trunk/subversion/libsvn_repos/config_pool.c

Modified: subversion/trunk/subversion/libsvn_repos/config_pool.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/config_pool.c?rev=1532874&r1=1532873&r2=1532874&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/config_pool.c (original)
+++ subversion/trunk/subversion/libsvn_repos/config_pool.c Wed Oct 16 19:54:05 2013
@@ -446,31 +446,24 @@ find_repos_config(svn_config_t **cfg,
                   apr_pool_t *result_pool,
                   apr_pool_t *scratch_pool)
 {
-#if 0
   svn_repos_t *repos;
   svn_fs_t *fs;
   svn_fs_root_t *root;
   svn_revnum_t youngest_rev;
   svn_node_kind_t node_kind;
-#endif
   const char *dirent;
-#if 0
   svn_stream_t *stream;
   const char *fs_path;
-#endif
   const char *repos_root_dirent;
-#if 0
   svn_checksum_t *checksum;
   svn_stringbuf_t *contents;
-#endif
 
   *cfg = NULL;
   SVN_ERR(svn_uri_get_dirent_from_file_url(&dirent, url, scratch_pool));
 
   /* Search for a repository in the full path. */
   repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
-    return SVN_NO_ERROR;
-#if 0
+
   /* Attempt to open a repository at repos_root_dirent. */
   SVN_ERR(svn_repos_open2(&repos, repos_root_dirent, NULL, scratch_pool));
 
@@ -518,7 +511,6 @@ find_repos_config(svn_config_t **cfg,
                                       youngest_rev, checksum));
 
   return SVN_NO_ERROR;
-#endif
 }
 
 /* Set *CFG to the configuration cached in CONFIG_POOL for URL.  If no