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 2016/11/15 19:05:52 UTC

svn commit: r1769869 - in /subversion/branches/authzperf/subversion/libsvn_repos: authz.h repos.h

Author: stefan2
Date: Tue Nov 15 19:05:52 2016
New Revision: 1769869

URL: http://svn.apache.org/viewvc?rev=1769869&view=rev
Log:
On the authzperf branch: Minor header cleanup.

* subversion/libsvn_repos/repos.h
  (svn_repos__authz_read): Remove here because it is no longer used
                           outside our authz code.

* subversion/libsvn_repos/authz.h
  (svn_repos__authz_read): Move it here.

Modified:
    subversion/branches/authzperf/subversion/libsvn_repos/authz.h
    subversion/branches/authzperf/subversion/libsvn_repos/repos.h

Modified: subversion/branches/authzperf/subversion/libsvn_repos/authz.h
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/libsvn_repos/authz.h?rev=1769869&r1=1769868&r2=1769869&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/libsvn_repos/authz.h (original)
+++ subversion/branches/authzperf/subversion/libsvn_repos/authz.h Tue Nov 15 19:05:52 2016
@@ -299,6 +299,26 @@ svn_authz__parse(svn_authz_t **authz,
                  apr_pool_t *scratch_pool);
 
 
+/* Read authz configuration data from PATH into *AUTHZ_P, allocated in
+   RESULT_POOL.  If GROUPS_PATH is set, use the global groups parsed from it.
+   Use SCRATCH_POOL for temporary allocations.
+
+   PATH and GROUPS_PATH may be a dirent or a registry path and iff ACCEPT_URLS
+   is set it may also be an absolute file url.
+
+   If PATH or GROUPS_PATH is not a valid authz rule file, then return
+   SVN_AUTHZ_INVALID_CONFIG.  The contents of *AUTHZ_P is then
+   undefined.  If MUST_EXIST is TRUE, a missing authz or global groups file
+   is also an error. */
+svn_error_t *
+svn_repos__authz_read(svn_authz_t **authz_p,
+                      const char *path,
+                      const char *groups_path,
+                      svn_boolean_t must_exist,
+                      svn_boolean_t accept_urls,
+                      apr_pool_t *result_pool,
+                      apr_pool_t *scratch_pool);
+
 /* Reverse a STRING of length LEN in place. */
 void
 svn_authz__reverse_string(char *string, apr_size_t len);

Modified: subversion/branches/authzperf/subversion/libsvn_repos/repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/libsvn_repos/repos.h?rev=1769869&r1=1769868&r2=1769869&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/libsvn_repos/repos.h (original)
+++ subversion/branches/authzperf/subversion/libsvn_repos/repos.h Tue Nov 15 19:05:52 2016
@@ -363,29 +363,6 @@ svn_repos__hooks_post_unlock(svn_repos_t
                              apr_pool_t *pool);
 
 
-/*** Authz Functions ***/
-
-/* Read authz configuration data from PATH into *AUTHZ_P, allocated in
-   RESULT_POOL.  If GROUPS_PATH is set, use the global groups parsed from it.
-   Use SCRATCH_POOL for temporary allocations.
-
-   PATH and GROUPS_PATH may be a dirent or a registry path and iff ACCEPT_URLS
-   is set it may also be an absolute file url.
-
-   If PATH or GROUPS_PATH is not a valid authz rule file, then return
-   SVN_AUTHZ_INVALID_CONFIG.  The contents of *AUTHZ_P is then
-   undefined.  If MUST_EXIST is TRUE, a missing authz or global groups file
-   is also an error. */
-svn_error_t *
-svn_repos__authz_read(svn_authz_t **authz_p,
-                      const char *path,
-                      const char *groups_path,
-                      svn_boolean_t must_exist,
-                      svn_boolean_t accept_urls,
-                      apr_pool_t *result_pool,
-                      apr_pool_t *scratch_pool);
-
-
 /*** Utility Functions ***/
 
 /* Set *PREV_PATH and *PREV_REV to the path and revision which